diff --git a/Nancy.ruleset b/Nancy.ruleset
new file mode 100644
index 0000000000..ccb49b0b02
--- /dev/null
+++ b/Nancy.ruleset
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Nancy" ToolsVersion="14.0">
+  <Include Path="allrules.ruleset" Action="Default" />
+  <Rules AnalyzerId="AsyncUsageAnalyzers" RuleNamespace="AsyncUsageAnalyzers">
+    <Rule Id="AvoidAsyncVoid" Action="Error" />
+    <Rule Id="UseConfigureAwait" Action="Error" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="None" />
+    <Rule Id="CA1001" Action="None" />
+    <Rule Id="CA1002" Action="None" />
+    <Rule Id="CA1003" Action="None" />
+    <Rule Id="CA1004" Action="None" />
+    <Rule Id="CA1005" Action="None" />
+    <Rule Id="CA1006" Action="None" />
+    <Rule Id="CA1007" Action="None" />
+    <Rule Id="CA1008" Action="None" />
+    <Rule Id="CA1009" Action="None" />
+    <Rule Id="CA1010" Action="None" />
+    <Rule Id="CA1011" Action="None" />
+    <Rule Id="CA1012" Action="None" />
+    <Rule Id="CA1013" Action="None" />
+    <Rule Id="CA1014" Action="None" />
+    <Rule Id="CA1016" Action="None" />
+    <Rule Id="CA1017" Action="None" />
+    <Rule Id="CA1018" Action="None" />
+    <Rule Id="CA1019" Action="None" />
+    <Rule Id="CA1020" Action="None" />
+    <Rule Id="CA1021" Action="None" />
+    <Rule Id="CA1023" Action="None" />
+    <Rule Id="CA1024" Action="None" />
+    <Rule Id="CA1025" Action="None" />
+    <Rule Id="CA1026" Action="None" />
+    <Rule Id="CA1027" Action="None" />
+    <Rule Id="CA1028" Action="None" />
+    <Rule Id="CA1030" Action="None" />
+    <Rule Id="CA1031" Action="None" />
+    <Rule Id="CA1032" Action="None" />
+    <Rule Id="CA1033" Action="None" />
+    <Rule Id="CA1034" Action="None" />
+    <Rule Id="CA1035" Action="None" />
+    <Rule Id="CA1036" Action="None" />
+    <Rule Id="CA1038" Action="None" />
+    <Rule Id="CA1039" Action="None" />
+    <Rule Id="CA1040" Action="None" />
+    <Rule Id="CA1041" Action="None" />
+    <Rule Id="CA1043" Action="None" />
+    <Rule Id="CA1044" Action="None" />
+    <Rule Id="CA1045" Action="None" />
+    <Rule Id="CA1046" Action="None" />
+    <Rule Id="CA1047" Action="None" />
+    <Rule Id="CA1048" Action="None" />
+    <Rule Id="CA1049" Action="None" />
+    <Rule Id="CA1050" Action="None" />
+    <Rule Id="CA1051" Action="None" />
+    <Rule Id="CA1052" Action="None" />
+    <Rule Id="CA1053" Action="None" />
+    <Rule Id="CA1054" Action="None" />
+    <Rule Id="CA1055" Action="None" />
+    <Rule Id="CA1056" Action="None" />
+    <Rule Id="CA1057" Action="None" />
+    <Rule Id="CA1058" Action="None" />
+    <Rule Id="CA1059" Action="None" />
+    <Rule Id="CA1060" Action="None" />
+    <Rule Id="CA1061" Action="None" />
+    <Rule Id="CA1062" Action="None" />
+    <Rule Id="CA1063" Action="None" />
+    <Rule Id="CA1064" Action="None" />
+    <Rule Id="CA1065" Action="None" />
+    <Rule Id="CA1300" Action="None" />
+    <Rule Id="CA1301" Action="None" />
+    <Rule Id="CA1302" Action="None" />
+    <Rule Id="CA1303" Action="None" />
+    <Rule Id="CA1304" Action="None" />
+    <Rule Id="CA1305" Action="None" />
+    <Rule Id="CA1306" Action="None" />
+    <Rule Id="CA1307" Action="None" />
+    <Rule Id="CA1308" Action="None" />
+    <Rule Id="CA1309" Action="None" />
+    <Rule Id="CA1400" Action="None" />
+    <Rule Id="CA1401" Action="None" />
+    <Rule Id="CA1402" Action="None" />
+    <Rule Id="CA1403" Action="None" />
+    <Rule Id="CA1404" Action="None" />
+    <Rule Id="CA1405" Action="None" />
+    <Rule Id="CA1406" Action="None" />
+    <Rule Id="CA1407" Action="None" />
+    <Rule Id="CA1408" Action="None" />
+    <Rule Id="CA1409" Action="None" />
+    <Rule Id="CA1410" Action="None" />
+    <Rule Id="CA1411" Action="None" />
+    <Rule Id="CA1412" Action="None" />
+    <Rule Id="CA1413" Action="None" />
+    <Rule Id="CA1414" Action="None" />
+    <Rule Id="CA1415" Action="None" />
+    <Rule Id="CA1500" Action="None" />
+    <Rule Id="CA1501" Action="None" />
+    <Rule Id="CA1502" Action="None" />
+    <Rule Id="CA1504" Action="None" />
+    <Rule Id="CA1505" Action="None" />
+    <Rule Id="CA1506" Action="None" />
+    <Rule Id="CA1600" Action="None" />
+    <Rule Id="CA1601" Action="None" />
+    <Rule Id="CA1700" Action="None" />
+    <Rule Id="CA1701" Action="None" />
+    <Rule Id="CA1702" Action="None" />
+    <Rule Id="CA1703" Action="None" />
+    <Rule Id="CA1704" Action="None" />
+    <Rule Id="CA1707" Action="None" />
+    <Rule Id="CA1708" Action="None" />
+    <Rule Id="CA1709" Action="None" />
+    <Rule Id="CA1710" Action="None" />
+    <Rule Id="CA1711" Action="None" />
+    <Rule Id="CA1712" Action="None" />
+    <Rule Id="CA1713" Action="None" />
+    <Rule Id="CA1714" Action="None" />
+    <Rule Id="CA1715" Action="None" />
+    <Rule Id="CA1716" Action="None" />
+    <Rule Id="CA1717" Action="None" />
+    <Rule Id="CA1719" Action="None" />
+    <Rule Id="CA1720" Action="None" />
+    <Rule Id="CA1721" Action="None" />
+    <Rule Id="CA1722" Action="None" />
+    <Rule Id="CA1724" Action="None" />
+    <Rule Id="CA1725" Action="None" />
+    <Rule Id="CA1726" Action="None" />
+    <Rule Id="CA1800" Action="None" />
+    <Rule Id="CA1801" Action="None" />
+    <Rule Id="CA1802" Action="None" />
+    <Rule Id="CA1804" Action="None" />
+    <Rule Id="CA1806" Action="None" />
+    <Rule Id="CA1809" Action="None" />
+    <Rule Id="CA1810" Action="None" />
+    <Rule Id="CA1811" Action="None" />
+    <Rule Id="CA1812" Action="None" />
+    <Rule Id="CA1813" Action="None" />
+    <Rule Id="CA1814" Action="None" />
+    <Rule Id="CA1815" Action="None" />
+    <Rule Id="CA1816" Action="None" />
+    <Rule Id="CA1819" Action="None" />
+    <Rule Id="CA1820" Action="None" />
+    <Rule Id="CA1821" Action="None" />
+    <Rule Id="CA1822" Action="None" />
+    <Rule Id="CA1823" Action="None" />
+    <Rule Id="CA1824" Action="None" />
+    <Rule Id="CA1900" Action="None" />
+    <Rule Id="CA1901" Action="None" />
+    <Rule Id="CA1903" Action="None" />
+    <Rule Id="CA2000" Action="None" />
+    <Rule Id="CA2001" Action="None" />
+    <Rule Id="CA2002" Action="None" />
+    <Rule Id="CA2003" Action="None" />
+    <Rule Id="CA2004" Action="None" />
+    <Rule Id="CA2006" Action="None" />
+    <Rule Id="CA2100" Action="None" />
+    <Rule Id="CA2101" Action="None" />
+    <Rule Id="CA2102" Action="None" />
+    <Rule Id="CA2103" Action="None" />
+    <Rule Id="CA2104" Action="None" />
+    <Rule Id="CA2105" Action="None" />
+    <Rule Id="CA2106" Action="None" />
+    <Rule Id="CA2107" Action="None" />
+    <Rule Id="CA2108" Action="None" />
+    <Rule Id="CA2109" Action="None" />
+    <Rule Id="CA2111" Action="None" />
+    <Rule Id="CA2112" Action="None" />
+    <Rule Id="CA2114" Action="None" />
+    <Rule Id="CA2115" Action="None" />
+    <Rule Id="CA2116" Action="None" />
+    <Rule Id="CA2117" Action="None" />
+    <Rule Id="CA2118" Action="None" />
+    <Rule Id="CA2119" Action="None" />
+    <Rule Id="CA2120" Action="None" />
+    <Rule Id="CA2121" Action="None" />
+    <Rule Id="CA2122" Action="None" />
+    <Rule Id="CA2123" Action="None" />
+    <Rule Id="CA2124" Action="None" />
+    <Rule Id="CA2126" Action="None" />
+    <Rule Id="CA2130" Action="None" />
+    <Rule Id="CA2131" Action="None" />
+    <Rule Id="CA2132" Action="None" />
+    <Rule Id="CA2133" Action="None" />
+    <Rule Id="CA2134" Action="None" />
+    <Rule Id="CA2135" Action="None" />
+    <Rule Id="CA2136" Action="None" />
+    <Rule Id="CA2137" Action="None" />
+    <Rule Id="CA2138" Action="None" />
+    <Rule Id="CA2139" Action="None" />
+    <Rule Id="CA2140" Action="None" />
+    <Rule Id="CA2141" Action="None" />
+    <Rule Id="CA2142" Action="None" />
+    <Rule Id="CA2143" Action="None" />
+    <Rule Id="CA2144" Action="None" />
+    <Rule Id="CA2145" Action="None" />
+    <Rule Id="CA2146" Action="None" />
+    <Rule Id="CA2147" Action="None" />
+    <Rule Id="CA2149" Action="None" />
+    <Rule Id="CA2151" Action="None" />
+    <Rule Id="CA2200" Action="None" />
+    <Rule Id="CA2201" Action="None" />
+    <Rule Id="CA2202" Action="None" />
+    <Rule Id="CA2204" Action="None" />
+    <Rule Id="CA2205" Action="None" />
+    <Rule Id="CA2207" Action="None" />
+    <Rule Id="CA2208" Action="None" />
+    <Rule Id="CA2210" Action="None" />
+    <Rule Id="CA2211" Action="None" />
+    <Rule Id="CA2212" Action="None" />
+    <Rule Id="CA2213" Action="None" />
+    <Rule Id="CA2214" Action="None" />
+    <Rule Id="CA2215" Action="None" />
+    <Rule Id="CA2216" Action="None" />
+    <Rule Id="CA2217" Action="None" />
+    <Rule Id="CA2218" Action="None" />
+    <Rule Id="CA2219" Action="None" />
+    <Rule Id="CA2220" Action="None" />
+    <Rule Id="CA2221" Action="None" />
+    <Rule Id="CA2222" Action="None" />
+    <Rule Id="CA2223" Action="None" />
+    <Rule Id="CA2224" Action="None" />
+    <Rule Id="CA2225" Action="None" />
+    <Rule Id="CA2226" Action="None" />
+    <Rule Id="CA2227" Action="None" />
+    <Rule Id="CA2228" Action="None" />
+    <Rule Id="CA2229" Action="None" />
+    <Rule Id="CA2230" Action="None" />
+    <Rule Id="CA2231" Action="None" />
+    <Rule Id="CA2232" Action="None" />
+    <Rule Id="CA2233" Action="None" />
+    <Rule Id="CA2234" Action="None" />
+    <Rule Id="CA2235" Action="None" />
+    <Rule Id="CA2236" Action="None" />
+    <Rule Id="CA2237" Action="None" />
+    <Rule Id="CA2238" Action="None" />
+    <Rule Id="CA2239" Action="None" />
+    <Rule Id="CA2240" Action="None" />
+    <Rule Id="CA2241" Action="None" />
+    <Rule Id="CA2242" Action="None" />
+    <Rule Id="CA2243" Action="None" />
+    <Rule Id="CA5122" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
+    <Rule Id="AD0001" Action="None" />
+    <Rule Id="CS0028" Action="None" />
+    <Rule Id="CS0078" Action="None" />
+    <Rule Id="CS0105" Action="None" />
+    <Rule Id="CS0108" Action="None" />
+    <Rule Id="CS0109" Action="None" />
+    <Rule Id="CS0114" Action="None" />
+    <Rule Id="CS0162" Action="None" />
+    <Rule Id="CS0164" Action="None" />
+    <Rule Id="CS0168" Action="None" />
+    <Rule Id="CS0183" Action="None" />
+    <Rule Id="CS0184" Action="None" />
+    <Rule Id="CS0197" Action="None" />
+    <Rule Id="CS0219" Action="None" />
+    <Rule Id="CS0251" Action="None" />
+    <Rule Id="CS0252" Action="None" />
+    <Rule Id="CS0253" Action="None" />
+    <Rule Id="CS0278" Action="None" />
+    <Rule Id="CS0279" Action="None" />
+    <Rule Id="CS0280" Action="None" />
+    <Rule Id="CS0282" Action="None" />
+    <Rule Id="CS0402" Action="None" />
+    <Rule Id="CS0419" Action="None" />
+    <Rule Id="CS0420" Action="None" />
+    <Rule Id="CS0435" Action="None" />
+    <Rule Id="CS0436" Action="None" />
+    <Rule Id="CS0437" Action="None" />
+    <Rule Id="CS0440" Action="None" />
+    <Rule Id="CS0458" Action="None" />
+    <Rule Id="CS0464" Action="None" />
+    <Rule Id="CS0465" Action="None" />
+    <Rule Id="CS0469" Action="None" />
+    <Rule Id="CS0472" Action="None" />
+    <Rule Id="CS0473" Action="None" />
+    <Rule Id="CS0612" Action="None" />
+    <Rule Id="CS0618" Action="None" />
+    <Rule Id="CS0626" Action="None" />
+    <Rule Id="CS0628" Action="None" />
+    <Rule Id="CS0642" Action="None" />
+    <Rule Id="CS0652" Action="None" />
+    <Rule Id="CS0657" Action="None" />
+    <Rule Id="CS0658" Action="None" />
+    <Rule Id="CS0659" Action="None" />
+    <Rule Id="CS0660" Action="None" />
+    <Rule Id="CS0661" Action="None" />
+    <Rule Id="CS0665" Action="None" />
+    <Rule Id="CS0672" Action="None" />
+    <Rule Id="CS0675" Action="None" />
+    <Rule Id="CS0684" Action="None" />
+    <Rule Id="CS0693" Action="None" />
+    <Rule Id="CS0728" Action="None" />
+    <Rule Id="CS0809" Action="None" />
+    <Rule Id="CS0811" Action="None" />
+    <Rule Id="CS0824" Action="None" />
+    <Rule Id="CS1030" Action="None" />
+    <Rule Id="CS1058" Action="None" />
+    <Rule Id="CS1062" Action="None" />
+    <Rule Id="CS1064" Action="None" />
+    <Rule Id="CS1066" Action="None" />
+    <Rule Id="CS1072" Action="None" />
+    <Rule Id="CS1522" Action="None" />
+    <Rule Id="CS1570" Action="None" />
+    <Rule Id="CS1571" Action="None" />
+    <Rule Id="CS1572" Action="None" />
+    <Rule Id="CS1573" Action="None" />
+    <Rule Id="CS1574" Action="None" />
+    <Rule Id="CS1580" Action="None" />
+    <Rule Id="CS1581" Action="None" />
+    <Rule Id="CS1584" Action="None" />
+    <Rule Id="CS1587" Action="None" />
+    <Rule Id="CS1589" Action="None" />
+    <Rule Id="CS1590" Action="None" />
+    <Rule Id="CS1591" Action="None" />
+    <Rule Id="CS1592" Action="None" />
+    <Rule Id="CS1616" Action="None" />
+    <Rule Id="CS1633" Action="None" />
+    <Rule Id="CS1634" Action="None" />
+    <Rule Id="CS1635" Action="None" />
+    <Rule Id="CS1645" Action="None" />
+    <Rule Id="CS1658" Action="None" />
+    <Rule Id="CS1668" Action="None" />
+    <Rule Id="CS1685" Action="None" />
+    <Rule Id="CS1687" Action="None" />
+    <Rule Id="CS1690" Action="None" />
+    <Rule Id="CS1692" Action="None" />
+    <Rule Id="CS1695" Action="None" />
+    <Rule Id="CS1696" Action="None" />
+    <Rule Id="CS1697" Action="None" />
+    <Rule Id="CS1700" Action="None" />
+    <Rule Id="CS1701" Action="None" />
+    <Rule Id="CS1702" Action="None" />
+    <Rule Id="CS1710" Action="None" />
+    <Rule Id="CS1711" Action="None" />
+    <Rule Id="CS1712" Action="None" />
+    <Rule Id="CS1717" Action="None" />
+    <Rule Id="CS1718" Action="None" />
+    <Rule Id="CS1720" Action="None" />
+    <Rule Id="CS1723" Action="None" />
+    <Rule Id="CS1734" Action="None" />
+    <Rule Id="CS1735" Action="None" />
+    <Rule Id="CS1762" Action="None" />
+    <Rule Id="CS1927" Action="None" />
+    <Rule Id="CS1956" Action="None" />
+    <Rule Id="CS1957" Action="None" />
+    <Rule Id="CS1974" Action="None" />
+    <Rule Id="CS1981" Action="None" />
+    <Rule Id="CS1998" Action="None" />
+    <Rule Id="CS2002" Action="None" />
+    <Rule Id="CS2008" Action="None" />
+    <Rule Id="CS2023" Action="None" />
+    <Rule Id="CS2029" Action="None" />
+    <Rule Id="CS2038" Action="None" />
+    <Rule Id="CS3000" Action="None" />
+    <Rule Id="CS3001" Action="None" />
+    <Rule Id="CS3002" Action="None" />
+    <Rule Id="CS3003" Action="None" />
+    <Rule Id="CS3005" Action="None" />
+    <Rule Id="CS3006" Action="None" />
+    <Rule Id="CS3007" Action="None" />
+    <Rule Id="CS3008" Action="None" />
+    <Rule Id="CS3009" Action="None" />
+    <Rule Id="CS3010" Action="None" />
+    <Rule Id="CS3011" Action="None" />
+    <Rule Id="CS3012" Action="None" />
+    <Rule Id="CS3013" Action="None" />
+    <Rule Id="CS3014" Action="None" />
+    <Rule Id="CS3015" Action="None" />
+    <Rule Id="CS3016" Action="None" />
+    <Rule Id="CS3017" Action="None" />
+    <Rule Id="CS3018" Action="None" />
+    <Rule Id="CS3019" Action="None" />
+    <Rule Id="CS3021" Action="None" />
+    <Rule Id="CS3022" Action="None" />
+    <Rule Id="CS3023" Action="None" />
+    <Rule Id="CS3024" Action="None" />
+    <Rule Id="CS3026" Action="None" />
+    <Rule Id="CS3027" Action="None" />
+    <Rule Id="CS4014" Action="None" />
+    <Rule Id="CS4024" Action="None" />
+    <Rule Id="CS4025" Action="None" />
+    <Rule Id="CS4026" Action="None" />
+    <Rule Id="CS7022" Action="None" />
+    <Rule Id="CS7033" Action="None" />
+    <Rule Id="CS7035" Action="None" />
+    <Rule Id="CS7080" Action="None" />
+    <Rule Id="CS7081" Action="None" />
+    <Rule Id="CS7082" Action="None" />
+    <Rule Id="CS7090" Action="None" />
+    <Rule Id="CS7095" Action="None" />
+    <Rule Id="CS8001" Action="None" />
+    <Rule Id="CS8002" Action="None" />
+    <Rule Id="CS8009" Action="None" />
+    <Rule Id="CS8012" Action="None" />
+    <Rule Id="CS8018" Action="None" />
+    <Rule Id="CS8019" Action="None" />
+    <Rule Id="CS8020" Action="None" />
+    <Rule Id="CS8021" Action="None" />
+    <Rule Id="CS8029" Action="None" />
+    <Rule Id="CS8032" Action="None" />
+    <Rule Id="CS8033" Action="None" />
+    <Rule Id="CS8034" Action="None" />
+    <Rule Id="CS8040" Action="None" />
+    <Rule Id="CS8073" Action="None" />
+    <Rule Id="CS8094" Action="None" />
+    <Rule Id="CS8105" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.EditorFeatures" RuleNamespace="Microsoft.CodeAnalysis.CSharp.EditorFeatures">
+    <Rule Id="UseAutoProperty" Action="None" />
+    <Rule Id="UseAutoPropertyFadedToken" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
+    <Rule Id="IDE0001" Action="None" />
+    <Rule Id="IDE0002" Action="None" />
+    <Rule Id="IDE0003" Action="None" />
+    <Rule Id="IDE0004" Action="None" />
+    <Rule Id="IDE0005" Action="None" />
+    <Rule Id="IDE1005" Action="None" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj b/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj
index dcd21e9034..179a4afe64 100644
--- a/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj
+++ b/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Authentication.Basic.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -124,6 +124,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Authentication.Basic.MSBuild/packages.config b/src/Nancy.Authentication.Basic.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Authentication.Basic.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Basic/project.json b/src/Nancy.Authentication.Basic/project.json
index f168f031c4..a63e701e9a 100644
--- a/src/Nancy.Authentication.Basic/project.json
+++ b/src/Nancy.Authentication.Basic/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "A basic HTTP authentication provider for Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj b/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj
index d8395ce6dc..eae8ad1527 100644
--- a/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj
+++ b/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Authentication.Forms.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -121,6 +121,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Authentication.Forms.MSBuild/packages.config b/src/Nancy.Authentication.Forms.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Authentication.Forms.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Forms/project.json b/src/Nancy.Authentication.Forms/project.json
index 5a8120984d..a7b681cc50 100644
--- a/src/Nancy.Authentication.Forms/project.json
+++ b/src/Nancy.Authentication.Forms/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "A forms authentication provider for Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj b/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj
index 9b18637517..f63e9852d0 100644
--- a/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj
+++ b/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Authentication.Stateless.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -108,6 +108,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Authentication.Stateless.MSBuild/packages.config b/src/Nancy.Authentication.Stateless.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Authentication.Stateless.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Stateless/project.json b/src/Nancy.Authentication.Stateless/project.json
index 59d58b7cad..25d9a39709 100644
--- a/src/Nancy.Authentication.Stateless/project.json
+++ b/src/Nancy.Authentication.Stateless/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "A stateless authentication provider for Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj b/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj
index 2bbd7b7f2d..92d40acf8d 100644
--- a/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj
+++ b/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj
@@ -22,6 +22,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Nancy.Embedded.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -55,6 +56,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Embedded.MSBuild/packages.config b/src/Nancy.Embedded.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Embedded.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Embedded/project.json b/src/Nancy.Embedded/project.json
index 9e5efad375..b1dfe4ddc9 100644
--- a/src/Nancy.Embedded/project.json
+++ b/src/Nancy.Embedded/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Helpers for serving embedded static content with Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj b/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj
index 13c27f8ac3..d654e91bfc 100644
--- a/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj
+++ b/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj
@@ -22,6 +22,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Nancy.Encryption.MachineKey.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -85,6 +86,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Encryption.MachineKey.MSBuild/packages.config b/src/Nancy.Encryption.MachineKey.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Encryption.MachineKey.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Encryption.MachineKey/project.json b/src/Nancy.Encryption.MachineKey/project.json
index cae59b13e0..887f0062b1 100644
--- a/src/Nancy.Encryption.MachineKey/project.json
+++ b/src/Nancy.Encryption.MachineKey/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "System.Web MachineKey encrypton and HMAC providers for Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj b/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj
index 3fdfb89d89..0fab681ac3 100644
--- a/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj
+++ b/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Hosting.Aspnet.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -135,6 +135,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Hosting.Aspnet.MSBuild/packages.config b/src/Nancy.Hosting.Aspnet.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Hosting.Aspnet.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Hosting.Aspnet/project.json b/src/Nancy.Hosting.Aspnet/project.json
index 5a1916d7a7..9933f09e71 100644
--- a/src/Nancy.Hosting.Aspnet/project.json
+++ b/src/Nancy.Hosting.Aspnet/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables hosting Nancy on ASP.NET.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj b/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj
index f5a770f9d9..eaff35b985 100644
--- a/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj
+++ b/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Hosting.Self.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -138,6 +138,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Hosting.Self.MSBuild/packages.config b/src/Nancy.Hosting.Self.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Hosting.Self.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Hosting.Self/project.json b/src/Nancy.Hosting.Self/project.json
index a1257b7342..ef5f07a36d 100644
--- a/src/Nancy.Hosting.Self/project.json
+++ b/src/Nancy.Hosting.Self/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables hosting Nancy in any application.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -16,7 +16,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.MSBuild/Nancy.csproj b/src/Nancy.MSBuild/Nancy.csproj
index b8d76e3df6..f84dc8f291 100644
--- a/src/Nancy.MSBuild/Nancy.csproj
+++ b/src/Nancy.MSBuild/Nancy.csproj
@@ -34,9 +34,10 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -356,15 +357,15 @@
     <Compile Include="..\Nancy\Helpers\ExceptionExtensions.cs">
       <Link>Helpers\ExceptionExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\Nancy\HttpLink.cs">
-      <Link>HttpLink.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpLinkBuilder.cs">
-      <Link>HttpLinkBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpLinkRelation.cs">
-      <Link>HttpLinkRelation.cs</Link>
-    </Compile>
+    <Compile Include="..\Nancy\HttpLink.cs">
+      <Link>HttpLink.cs</Link>
+    </Compile>
+    <Compile Include="..\Nancy\HttpLinkBuilder.cs">
+      <Link>HttpLinkBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\Nancy\HttpLinkRelation.cs">
+      <Link>HttpLinkRelation.cs</Link>
+    </Compile>
     <Compile Include="..\Nancy\IAssemblyCatalog.cs">
       <Link>IAssemblyCatalog.cs</Link>
     </Compile>
@@ -1534,6 +1535,12 @@
       <Link>Diagnostics\Views\login.sshtml</Link>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.MSBuild/packages.config b/src/Nancy.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Metadata.Modules.MSBuild/Nancy.Metadata.Modules.csproj b/src/Nancy.Metadata.Modules.MSBuild/Nancy.Metadata.Modules.csproj
index 5152288446..87cae61846 100644
--- a/src/Nancy.Metadata.Modules.MSBuild/Nancy.Metadata.Modules.csproj
+++ b/src/Nancy.Metadata.Modules.MSBuild/Nancy.Metadata.Modules.csproj
@@ -23,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Nancy.Metadata.Modules.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -96,6 +97,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Metadata.Modules.MSBuild/packages.config b/src/Nancy.Metadata.Modules.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Metadata.Modules.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Metadata.Modules/project.json b/src/Nancy.Metadata.Modules/project.json
index c621dea781..c2fab39561 100644
--- a/src/Nancy.Metadata.Modules/project.json
+++ b/src/Nancy.Metadata.Modules/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Nancy metadata modules to describe your APIs.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj b/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj
index b3c368b351..673cfffda5 100644
--- a/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj
+++ b/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj
@@ -22,6 +22,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Nancy.Owin.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -84,6 +85,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Owin.MSBuild/packages.config b/src/Nancy.Owin.MSBuild/packages.config
index 1a7d39faf4..b44272a8ce 100644
--- a/src/Nancy.Owin.MSBuild/packages.config
+++ b/src/Nancy.Owin.MSBuild/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Nancy.Owin/project.json b/src/Nancy.Owin/project.json
index a9c4512c4c..ce8faf13bb 100644
--- a/src/Nancy.Owin/project.json
+++ b/src/Nancy.Owin/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Nancy extensions for OWIN hosting.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" },
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" },
         "OWIN": "1.0.0"
     },
 
diff --git a/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj b/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj
index 8656331324..c227c97475 100644
--- a/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj
+++ b/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Testing.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -206,6 +206,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Testing.MSBuild/packages.config b/src/Nancy.Testing.MSBuild/packages.config
index 811a817923..c0255fd39e 100644
--- a/src/Nancy.Testing.MSBuild/packages.config
+++ b/src/Nancy.Testing.MSBuild/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/src/Nancy.Testing/project.json b/src/Nancy.Testing/project.json
index 7f3e5a1930..86bf929571 100644
--- a/src/Nancy.Testing/project.json
+++ b/src/Nancy.Testing/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Test harness for Nancy applications.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -12,6 +12,7 @@
 
     "dependencies": {
         "AngleSharp": "0.9.8.1",
+        "AsyncUsageAnalyzers": "1.0.0-alpha003",
         "Nancy": { "target": "project" },
         "Nancy.Authentication.Forms": { "target": "project" }
     },
diff --git a/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj b/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj
index d063a71770..597605ebd3 100644
--- a/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj
+++ b/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Validation.DataAnnotations.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -152,6 +152,12 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Validation.DataAnnotations.MSBuild/packages.config b/src/Nancy.Validation.DataAnnotations.MSBuild/packages.config
new file mode 100644
index 0000000000..a52600a908
--- /dev/null
+++ b/src/Nancy.Validation.DataAnnotations.MSBuild/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.Validation.DataAnnotations/project.json b/src/Nancy.Validation.DataAnnotations/project.json
index 07f9248a68..947a75e610 100644
--- a/src/Nancy.Validation.DataAnnotations/project.json
+++ b/src/Nancy.Validation.DataAnnotations/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Adds Data Annotation validation support to Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" }
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" }
     },
 
     "frameworks": {
diff --git a/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj b/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj
index 76e4d0ece7..b434146f9f 100644
--- a/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj
+++ b/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Validation.FluentValidation.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -179,6 +179,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.Validation.FluentValidation.MSBuild/packages.config b/src/Nancy.Validation.FluentValidation.MSBuild/packages.config
index 1746e06678..f2f8f6106f 100644
--- a/src/Nancy.Validation.FluentValidation.MSBuild/packages.config
+++ b/src/Nancy.Validation.FluentValidation.MSBuild/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="FluentValidation" version="6.3.4-alpha" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Nancy.Validation.FluentValidation/project.json b/src/Nancy.Validation.FluentValidation/project.json
index 17c6a23046..1ab7a86d9a 100644
--- a/src/Nancy.Validation.FluentValidation/project.json
+++ b/src/Nancy.Validation.FluentValidation/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Adds Fluent Validation support to Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -16,7 +16,8 @@
 
     "dependencies": {
         "Nancy": { "target": "project" },
-        "FluentValidation": "6.3.4-alpha"
+      "FluentValidation": "6.3.4-alpha",
+      "AsyncUsageAnalyzers": "1.0.0-alpha003"
     },
 
     "frameworks": {
diff --git a/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj b/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj
index 08141b3a25..9287443f11 100644
--- a/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj
+++ b/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.ViewEngines.DotLiquid.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -139,6 +139,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config b/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config
index fd7a1e8fff..b1d0466ab9 100644
--- a/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config
+++ b/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="DotLiquid" version="1.7.0" targetFramework="net45" />
-</packages>
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.DotLiquid/project.json b/src/Nancy.ViewEngines.DotLiquid/project.json
index 39942836a0..b23f0c3b38 100644
--- a/src/Nancy.ViewEngines.DotLiquid/project.json
+++ b/src/Nancy.ViewEngines.DotLiquid/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables using the DotLiquid view engine with Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -16,7 +16,8 @@
 
     "dependencies": {
         "Nancy": { "target": "project" },
-        "DotLiquid": "1.7.0"
+      "DotLiquid": "1.7.0",
+      "AsyncUsageAnalyzers": "1.0.0-alpha003"
     },
 
     "frameworks": {
diff --git a/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj b/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj
index fd29376988..6c8a7d77e5 100644
--- a/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj
+++ b/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj
@@ -24,6 +24,7 @@
     <ConsolePause>False</ConsolePause>
     <DocumentationFile>bin\Debug\Nancy.ViewEngines.Markdown.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -90,4 +91,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Markdown.MSBuild/packages.config b/src/Nancy.ViewEngines.Markdown.MSBuild/packages.config
index b494b9d9ae..050747c1c0 100644
--- a/src/Nancy.ViewEngines.Markdown.MSBuild/packages.config
+++ b/src/Nancy.ViewEngines.Markdown.MSBuild/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="MarkdownSharp" version="1.13.0.0" targetFramework="net45" />
-</packages>
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Markdown/project.json b/src/Nancy.ViewEngines.Markdown/project.json
index dd09a0e0e5..4d49744ec6 100644
--- a/src/Nancy.ViewEngines.Markdown/project.json
+++ b/src/Nancy.ViewEngines.Markdown/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables using Markdown with Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -16,7 +16,8 @@
 
     "dependencies": {
         "Nancy": { "target": "project" },
-        "MarkdownSharp": "1.13.0"
+      "MarkdownSharp": "1.13.0",
+      "AsyncUsageAnalyzers": "1.0.0-alpha003"
     },
 
     "frameworks": {
diff --git a/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj b/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj
index 632bf3319d..04b5f0b50c 100644
--- a/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj
+++ b/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.ViewEngines.Nustache.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -117,6 +117,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config b/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config
index f7e9f57677..efd93bb322 100644
--- a/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config
+++ b/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Nustache" version="1.13.8.22" targetFramework="net45" />
-</packages>
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Nustache/project.json b/src/Nancy.ViewEngines.Nustache/project.json
index 57389188fc..5e273afafe 100644
--- a/src/Nancy.ViewEngines.Nustache/project.json
+++ b/src/Nancy.ViewEngines.Nustache/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables using the Nustache view engine with Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" },
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" },
         "Nustache": "1.13.8.22"
     },
 
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/Nancy.ViewEngines.Razor.BuildProviders.csproj b/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/Nancy.ViewEngines.Razor.BuildProviders.csproj
index e8f137986c..c630f785b2 100644
--- a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/Nancy.ViewEngines.Razor.BuildProviders.csproj
+++ b/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/Nancy.ViewEngines.Razor.BuildProviders.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.ViewEngines.Razor.BuildProviders.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -122,6 +122,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config b/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config
index 039dbcc583..c3d194ab01 100644
--- a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config
+++ b/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.Net.Compilers" version="1.1.1" targetFramework="net45" developmentDependency="true" />
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders/project.json b/src/Nancy.ViewEngines.Razor.BuildProviders/project.json
index 7a54597cb0..4c809c4ae3 100644
--- a/src/Nancy.ViewEngines.Razor.BuildProviders/project.json
+++ b/src/Nancy.ViewEngines.Razor.BuildProviders/project.json
@@ -1,8 +1,9 @@
-{
+{
     "version": "2.0.0-barneyrubble",
 
     "dependencies": {
-        "Nancy": { "target": "project" },
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" },
         "Nancy.ViewEngines.Razor": { "target": "project" }
     },
     
diff --git a/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj b/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj
index dca386bf8d..7e71cfb84b 100644
--- a/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj
+++ b/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj
@@ -40,7 +40,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.ViewEngines.Razor.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -237,6 +237,7 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props'))" />
   </Target>
   <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
diff --git a/src/Nancy.ViewEngines.Razor.MSBuild/packages.config b/src/Nancy.ViewEngines.Razor.MSBuild/packages.config
index 8bbe35c48b..4fe35f2459 100644
--- a/src/Nancy.ViewEngines.Razor.MSBuild/packages.config
+++ b/src/Nancy.ViewEngines.Razor.MSBuild/packages.config
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.1" targetFramework="net45" />
-  <package id="Microsoft.Net.Compilers" version="1.1.1" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Common" version="1.1.1" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="1.1.1" targetFramework="net45" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.1" targetFramework="net45" />
+  <package id="Microsoft.Net.Compilers" version="1.1.1" targetFramework="net45" developmentDependency="true" />
   <package id="System.Collections" version="4.0.0" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.37" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net45" />
diff --git a/src/Nancy.ViewEngines.Razor/project.json b/src/Nancy.ViewEngines.Razor/project.json
index be18f5e4ab..9ef011d684 100644
--- a/src/Nancy.ViewEngines.Razor/project.json
+++ b/src/Nancy.ViewEngines.Razor/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables using the Razor view engine with Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -13,7 +13,8 @@
     "dependencies": {
         "Nancy": { "target": "project" },
         "Microsoft.AspNet.Razor": "2.0.30506.0",
-        "Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-20151109-01"
+      "Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-20151109-01",
+      "AsyncUsageAnalyzers": "1.0.0-alpha003"
     },
 
     "buildOptions": {
diff --git a/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj b/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj
index 3325b63a13..7665024a8e 100644
--- a/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj
+++ b/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.ViewEngines.Spark.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -150,6 +150,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Nancy.ViewEngines.Spark.MSBuild/packages.config b/src/Nancy.ViewEngines.Spark.MSBuild/packages.config
index 93d013b443..ed604cc643 100644
--- a/src/Nancy.ViewEngines.Spark.MSBuild/packages.config
+++ b/src/Nancy.ViewEngines.Spark.MSBuild/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
+  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Spark" version="1.7.0.0" targetFramework="net45" />
-</packages>
+</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Spark/project.json b/src/Nancy.ViewEngines.Spark/project.json
index e3815401d8..8600fac4f7 100644
--- a/src/Nancy.ViewEngines.Spark/project.json
+++ b/src/Nancy.ViewEngines.Spark/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Enables using the Spark view engine with Nancy.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -15,7 +15,8 @@
     },
 
     "dependencies": {
-        "Nancy": { "target": "project" },
+      "AsyncUsageAnalyzers": "1.0.0-alpha003",
+      "Nancy": { "target": "project" },
         "Spark": "1.7.0"
     },
 
diff --git a/src/Nancy/project.json b/src/Nancy/project.json
index 1bc5105da4..988704ae0c 100644
--- a/src/Nancy/project.json
+++ b/src/Nancy/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "2.0.0-barneyrubble",
     "description": "Nancy is a lightweight web framework for the .Net platform, inspired by Sinatra. Nancy aim at delivering a low ceremony approach to building light, fast web applications.",
     "authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
@@ -10,9 +10,10 @@
         "iconUrl": "http://nancyfx.org/nancy-nuget.png"
     },
 
-    "dependencies": {
-        "Microsoft.Extensions.DependencyModel": "1.0.0"
-    },
+  "dependencies": {
+    "AsyncUsageAnalyzers": "1.0.0-alpha003",
+    "Microsoft.Extensions.DependencyModel": "1.0.0"
+  },
 
     "buildOptions": {
         "xmlDoc": true,