diff --git a/Nancy.Next.sln b/Nancy.Next.sln
deleted file mode 100644
index aa2b1e6ec4..0000000000
--- a/Nancy.Next.sln
+++ /dev/null
@@ -1,288 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5734E9DC-CF67-4337-B28E-695280598B88}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy", "src\Nancy\Nancy.xproj", "{87C7C329-1824-4AC7-AF25-3D06068A01F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{AAB0D92A-7B90-478A-8360-3E6A20BD0B71}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-		NuGet.config = NuGet.config
-	EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Authentication.Basic", "src\Nancy.Authentication.Basic\Nancy.Authentication.Basic.xproj", "{0C3B1176-A01D-4EDD-A0B8-17F04C513025}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Authentication.Forms", "src\Nancy.Authentication.Forms\Nancy.Authentication.Forms.xproj", "{52B05C75-46F1-4C1B-B660-EDD88BA38924}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Authentication.Stateless", "src\Nancy.Authentication.Stateless\Nancy.Authentication.Stateless.xproj", "{7C8CD644-8C3E-491D-9583-CCDD352223C8}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Embedded", "src\Nancy.Embedded\Nancy.Embedded.xproj", "{A4DEDD2F-5565-404A-B60F-98217221518D}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Encryption.MachineKey", "src\Nancy.Encryption.MachineKey\Nancy.Encryption.MachineKey.xproj", "{186CAB00-195D-490F-873B-0B2B0FB546F2}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Hosting.Aspnet", "src\Nancy.Hosting.Aspnet\Nancy.Hosting.Aspnet.xproj", "{4262AB60-E51D-43D1-AE63-D60ED24CF04F}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Hosting.Self", "src\Nancy.Hosting.Self\Nancy.Hosting.Self.xproj", "{A3A80C91-557A-44DE-BD0F-AC3E96903424}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Metadata.Modules", "src\Nancy.Metadata.Modules\Nancy.Metadata.Modules.xproj", "{AD0737D9-12D7-449F-9B2D-A3045731C946}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Owin", "src\Nancy.Owin\Nancy.Owin.xproj", "{BAA9CBDF-F6B7-4C85-8A22-6A316A4ACC46}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Testing", "src\Nancy.Testing\Nancy.Testing.xproj", "{E948F38F-4F8B-41FE-8F49-4792F4EC2531}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Validation.DataAnnotations", "src\Nancy.Validation.DataAnnotations\Nancy.Validation.DataAnnotations.xproj", "{21FB2D6B-2525-4A24-BF66-D34941C7FA88}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Validation.FluentValidation", "src\Nancy.Validation.FluentValidation\Nancy.Validation.FluentValidation.xproj", "{35B9DD79-D65A-423C-9DC0-59DCF3BF2E98}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.DotLiquid", "src\Nancy.ViewEngines.DotLiquid\Nancy.ViewEngines.DotLiquid.xproj", "{98FEBB4D-CFF9-4318-B2F0-C5DCC5436A47}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Markdown", "src\Nancy.ViewEngines.Markdown\Nancy.ViewEngines.Markdown.xproj", "{CFA5BBCB-B41B-47C0-A4D2-FA243FC6ECC6}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Nustache", "src\Nancy.ViewEngines.Nustache\Nancy.ViewEngines.Nustache.xproj", "{32E22782-7A5E-4546-B2DB-F3628EA36361}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Razor", "src\Nancy.ViewEngines.Razor\Nancy.ViewEngines.Razor.xproj", "{3A376B78-DD7D-4450-9FDE-F7236FAA6E63}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Razor.BuildProviders", "src\Nancy.ViewEngines.Razor.BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.xproj", "{26DF3BE0-146B-43A6-B230-D5B33355F415}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Spark", "src\Nancy.ViewEngines.Spark\Nancy.ViewEngines.Spark.xproj", "{25E3AB38-D95E-4D11-B0F0-0F60571A97A0}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Tests", "test\Nancy.Tests\Nancy.Tests.xproj", "{3BA7D452-98E5-47B0-BD1E-DC348E13A72A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Authentication.Basic.Tests", "test\Nancy.Authentication.Basic.Tests\Nancy.Authentication.Basic.Tests.xproj", "{51494B38-0D18-4B9D-AB75-39E804747D5F}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Authentication.Forms.Tests", "test\Nancy.Authentication.Forms.Tests\Nancy.Authentication.Forms.Tests.xproj", "{93E15BE9-BF06-4F94-A42F-BFD664774DC5}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Embedded.Tests", "test\Nancy.Embedded.Tests\Nancy.Embedded.Tests.xproj", "{838F9240-4541-4646-AAC2-0EAA6F05A654}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Encryption.MachineKey.Tests", "test\Nancy.Encryption.MachineKey.Tests\Nancy.Encryption.MachineKey.Tests.xproj", "{FF8C9795-2AD5-45E6-851D-6BDF8A7841CE}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Hosting.Aspnet.Tests", "test\Nancy.Hosting.Aspnet.Tests\Nancy.Hosting.Aspnet.Tests.xproj", "{98067EC0-5028-432F-B94A-99195D70B76F}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Hosting.Self.Tests", "test\Nancy.Hosting.Self.Tests\Nancy.Hosting.Self.Tests.xproj", "{21AA5847-70DF-4C96-9AED-1C9A9AF9325C}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Metadata.Modules.Tests", "test\Nancy.Metadata.Modules.Tests\Nancy.Metadata.Modules.Tests.xproj", "{E5047274-5A15-41C6-986F-A6A36588A012}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Owin.Tests", "test\Nancy.Owin.Tests\Nancy.Owin.Tests.xproj", "{10771591-D09D-4FCC-990E-3982006FB1FA}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Testing.Tests", "test\Nancy.Testing.Tests\Nancy.Testing.Tests.xproj", "{CEFF8372-2F7A-41CB-8F13-164ABBA8ACA2}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Validation.DataAnnotatioins.Tests", "test\Nancy.Validation.DataAnnotatioins.Tests\Nancy.Validation.DataAnnotatioins.Tests.xproj", "{8830DBE0-2162-4F35-8D81-1577F17ABB10}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Validation.FluentValidation.Tests", "test\Nancy.Validation.FluentValidation.Tests\Nancy.Validation.FluentValidation.Tests.xproj", "{8DD96D02-C6D3-435B-B0F7-2460161A250F}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.DotLiquid.Tests", "test\Nancy.ViewEngines.DotLiquid.Tests\Nancy.ViewEngines.DotLiquid.Tests.xproj", "{91F4EA23-788B-4E54-A38E-FE738B3BF2F1}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Markdown.Tests", "test\Nancy.ViewEngines.Markdown.Tests\Nancy.ViewEngines.Markdown.Tests.xproj", "{C46BFAA7-F471-45A6-A5AC-FCF9390408EE}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Razor.Tests", "test\Nancy.ViewEngines.Razor.Tests\Nancy.ViewEngines.Razor.Tests.xproj", "{A24271FA-E058-42E0-BB7D-3C8C43DF4B04}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.ViewEngines.Razor.Tests.Models", "test\Nancy.ViewEngines.Razor.Tests.Models\Nancy.ViewEngines.Razor.Tests.Models.xproj", "{31FA18D3-24AD-4AB0-B297-5A2FD871989E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{AA791E28-7914-439A-B59A-580B8D8FE95D}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Demo.Hosting.Kestrel", "samples\Nancy.Demo.Hosting.Kestrel\Nancy.Demo.Hosting.Kestrel.xproj", "{9921E059-612B-4011-9AB6-FD30E69850A1}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Tests.Functional", "test\Nancy.Tests.Functional\Nancy.Tests.Functional.xproj", "{742AC687-FC9A-4534-BB50-3D91738563A7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C3B1176-A01D-4EDD-A0B8-17F04C513025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C3B1176-A01D-4EDD-A0B8-17F04C513025}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C3B1176-A01D-4EDD-A0B8-17F04C513025}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C3B1176-A01D-4EDD-A0B8-17F04C513025}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52B05C75-46F1-4C1B-B660-EDD88BA38924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52B05C75-46F1-4C1B-B660-EDD88BA38924}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52B05C75-46F1-4C1B-B660-EDD88BA38924}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52B05C75-46F1-4C1B-B660-EDD88BA38924}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C8CD644-8C3E-491D-9583-CCDD352223C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C8CD644-8C3E-491D-9583-CCDD352223C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C8CD644-8C3E-491D-9583-CCDD352223C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C8CD644-8C3E-491D-9583-CCDD352223C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4DEDD2F-5565-404A-B60F-98217221518D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4DEDD2F-5565-404A-B60F-98217221518D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4DEDD2F-5565-404A-B60F-98217221518D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4DEDD2F-5565-404A-B60F-98217221518D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{186CAB00-195D-490F-873B-0B2B0FB546F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{186CAB00-195D-490F-873B-0B2B0FB546F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{186CAB00-195D-490F-873B-0B2B0FB546F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{186CAB00-195D-490F-873B-0B2B0FB546F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4262AB60-E51D-43D1-AE63-D60ED24CF04F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4262AB60-E51D-43D1-AE63-D60ED24CF04F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4262AB60-E51D-43D1-AE63-D60ED24CF04F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4262AB60-E51D-43D1-AE63-D60ED24CF04F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3A80C91-557A-44DE-BD0F-AC3E96903424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3A80C91-557A-44DE-BD0F-AC3E96903424}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3A80C91-557A-44DE-BD0F-AC3E96903424}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3A80C91-557A-44DE-BD0F-AC3E96903424}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD0737D9-12D7-449F-9B2D-A3045731C946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD0737D9-12D7-449F-9B2D-A3045731C946}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD0737D9-12D7-449F-9B2D-A3045731C946}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD0737D9-12D7-449F-9B2D-A3045731C946}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAA9CBDF-F6B7-4C85-8A22-6A316A4ACC46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAA9CBDF-F6B7-4C85-8A22-6A316A4ACC46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAA9CBDF-F6B7-4C85-8A22-6A316A4ACC46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAA9CBDF-F6B7-4C85-8A22-6A316A4ACC46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E948F38F-4F8B-41FE-8F49-4792F4EC2531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E948F38F-4F8B-41FE-8F49-4792F4EC2531}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E948F38F-4F8B-41FE-8F49-4792F4EC2531}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E948F38F-4F8B-41FE-8F49-4792F4EC2531}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21FB2D6B-2525-4A24-BF66-D34941C7FA88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21FB2D6B-2525-4A24-BF66-D34941C7FA88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21FB2D6B-2525-4A24-BF66-D34941C7FA88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21FB2D6B-2525-4A24-BF66-D34941C7FA88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35B9DD79-D65A-423C-9DC0-59DCF3BF2E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35B9DD79-D65A-423C-9DC0-59DCF3BF2E98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35B9DD79-D65A-423C-9DC0-59DCF3BF2E98}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35B9DD79-D65A-423C-9DC0-59DCF3BF2E98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98FEBB4D-CFF9-4318-B2F0-C5DCC5436A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98FEBB4D-CFF9-4318-B2F0-C5DCC5436A47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98FEBB4D-CFF9-4318-B2F0-C5DCC5436A47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98FEBB4D-CFF9-4318-B2F0-C5DCC5436A47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFA5BBCB-B41B-47C0-A4D2-FA243FC6ECC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFA5BBCB-B41B-47C0-A4D2-FA243FC6ECC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFA5BBCB-B41B-47C0-A4D2-FA243FC6ECC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFA5BBCB-B41B-47C0-A4D2-FA243FC6ECC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32E22782-7A5E-4546-B2DB-F3628EA36361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32E22782-7A5E-4546-B2DB-F3628EA36361}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32E22782-7A5E-4546-B2DB-F3628EA36361}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32E22782-7A5E-4546-B2DB-F3628EA36361}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A376B78-DD7D-4450-9FDE-F7236FAA6E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A376B78-DD7D-4450-9FDE-F7236FAA6E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A376B78-DD7D-4450-9FDE-F7236FAA6E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A376B78-DD7D-4450-9FDE-F7236FAA6E63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26DF3BE0-146B-43A6-B230-D5B33355F415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26DF3BE0-146B-43A6-B230-D5B33355F415}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26DF3BE0-146B-43A6-B230-D5B33355F415}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26DF3BE0-146B-43A6-B230-D5B33355F415}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25E3AB38-D95E-4D11-B0F0-0F60571A97A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25E3AB38-D95E-4D11-B0F0-0F60571A97A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25E3AB38-D95E-4D11-B0F0-0F60571A97A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25E3AB38-D95E-4D11-B0F0-0F60571A97A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BA7D452-98E5-47B0-BD1E-DC348E13A72A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BA7D452-98E5-47B0-BD1E-DC348E13A72A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BA7D452-98E5-47B0-BD1E-DC348E13A72A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BA7D452-98E5-47B0-BD1E-DC348E13A72A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51494B38-0D18-4B9D-AB75-39E804747D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51494B38-0D18-4B9D-AB75-39E804747D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51494B38-0D18-4B9D-AB75-39E804747D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51494B38-0D18-4B9D-AB75-39E804747D5F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93E15BE9-BF06-4F94-A42F-BFD664774DC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93E15BE9-BF06-4F94-A42F-BFD664774DC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93E15BE9-BF06-4F94-A42F-BFD664774DC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93E15BE9-BF06-4F94-A42F-BFD664774DC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{838F9240-4541-4646-AAC2-0EAA6F05A654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{838F9240-4541-4646-AAC2-0EAA6F05A654}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{838F9240-4541-4646-AAC2-0EAA6F05A654}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{838F9240-4541-4646-AAC2-0EAA6F05A654}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF8C9795-2AD5-45E6-851D-6BDF8A7841CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF8C9795-2AD5-45E6-851D-6BDF8A7841CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF8C9795-2AD5-45E6-851D-6BDF8A7841CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF8C9795-2AD5-45E6-851D-6BDF8A7841CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98067EC0-5028-432F-B94A-99195D70B76F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98067EC0-5028-432F-B94A-99195D70B76F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98067EC0-5028-432F-B94A-99195D70B76F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98067EC0-5028-432F-B94A-99195D70B76F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21AA5847-70DF-4C96-9AED-1C9A9AF9325C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21AA5847-70DF-4C96-9AED-1C9A9AF9325C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21AA5847-70DF-4C96-9AED-1C9A9AF9325C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21AA5847-70DF-4C96-9AED-1C9A9AF9325C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5047274-5A15-41C6-986F-A6A36588A012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5047274-5A15-41C6-986F-A6A36588A012}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5047274-5A15-41C6-986F-A6A36588A012}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5047274-5A15-41C6-986F-A6A36588A012}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10771591-D09D-4FCC-990E-3982006FB1FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10771591-D09D-4FCC-990E-3982006FB1FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10771591-D09D-4FCC-990E-3982006FB1FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10771591-D09D-4FCC-990E-3982006FB1FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEFF8372-2F7A-41CB-8F13-164ABBA8ACA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEFF8372-2F7A-41CB-8F13-164ABBA8ACA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEFF8372-2F7A-41CB-8F13-164ABBA8ACA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEFF8372-2F7A-41CB-8F13-164ABBA8ACA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8830DBE0-2162-4F35-8D81-1577F17ABB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8830DBE0-2162-4F35-8D81-1577F17ABB10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8830DBE0-2162-4F35-8D81-1577F17ABB10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8830DBE0-2162-4F35-8D81-1577F17ABB10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DD96D02-C6D3-435B-B0F7-2460161A250F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DD96D02-C6D3-435B-B0F7-2460161A250F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DD96D02-C6D3-435B-B0F7-2460161A250F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DD96D02-C6D3-435B-B0F7-2460161A250F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91F4EA23-788B-4E54-A38E-FE738B3BF2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91F4EA23-788B-4E54-A38E-FE738B3BF2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91F4EA23-788B-4E54-A38E-FE738B3BF2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91F4EA23-788B-4E54-A38E-FE738B3BF2F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C46BFAA7-F471-45A6-A5AC-FCF9390408EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C46BFAA7-F471-45A6-A5AC-FCF9390408EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C46BFAA7-F471-45A6-A5AC-FCF9390408EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C46BFAA7-F471-45A6-A5AC-FCF9390408EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A24271FA-E058-42E0-BB7D-3C8C43DF4B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A24271FA-E058-42E0-BB7D-3C8C43DF4B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A24271FA-E058-42E0-BB7D-3C8C43DF4B04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A24271FA-E058-42E0-BB7D-3C8C43DF4B04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31FA18D3-24AD-4AB0-B297-5A2FD871989E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31FA18D3-24AD-4AB0-B297-5A2FD871989E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31FA18D3-24AD-4AB0-B297-5A2FD871989E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31FA18D3-24AD-4AB0-B297-5A2FD871989E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9921E059-612B-4011-9AB6-FD30E69850A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9921E059-612B-4011-9AB6-FD30E69850A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9921E059-612B-4011-9AB6-FD30E69850A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9921E059-612B-4011-9AB6-FD30E69850A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{742AC687-FC9A-4534-BB50-3D91738563A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{742AC687-FC9A-4534-BB50-3D91738563A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{742AC687-FC9A-4534-BB50-3D91738563A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{742AC687-FC9A-4534-BB50-3D91738563A7}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{87C7C329-1824-4AC7-AF25-3D06068A01F6} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{0C3B1176-A01D-4EDD-A0B8-17F04C513025} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{52B05C75-46F1-4C1B-B660-EDD88BA38924} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{7C8CD644-8C3E-491D-9583-CCDD352223C8} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{A4DEDD2F-5565-404A-B60F-98217221518D} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{186CAB00-195D-490F-873B-0B2B0FB546F2} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{4262AB60-E51D-43D1-AE63-D60ED24CF04F} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{A3A80C91-557A-44DE-BD0F-AC3E96903424} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{AD0737D9-12D7-449F-9B2D-A3045731C946} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{BAA9CBDF-F6B7-4C85-8A22-6A316A4ACC46} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{E948F38F-4F8B-41FE-8F49-4792F4EC2531} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{21FB2D6B-2525-4A24-BF66-D34941C7FA88} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{35B9DD79-D65A-423C-9DC0-59DCF3BF2E98} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{98FEBB4D-CFF9-4318-B2F0-C5DCC5436A47} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{CFA5BBCB-B41B-47C0-A4D2-FA243FC6ECC6} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{32E22782-7A5E-4546-B2DB-F3628EA36361} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{3A376B78-DD7D-4450-9FDE-F7236FAA6E63} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{26DF3BE0-146B-43A6-B230-D5B33355F415} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{25E3AB38-D95E-4D11-B0F0-0F60571A97A0} = {5734E9DC-CF67-4337-B28E-695280598B88}
-		{3BA7D452-98E5-47B0-BD1E-DC348E13A72A} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{51494B38-0D18-4B9D-AB75-39E804747D5F} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{93E15BE9-BF06-4F94-A42F-BFD664774DC5} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{838F9240-4541-4646-AAC2-0EAA6F05A654} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{FF8C9795-2AD5-45E6-851D-6BDF8A7841CE} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{98067EC0-5028-432F-B94A-99195D70B76F} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{21AA5847-70DF-4C96-9AED-1C9A9AF9325C} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{E5047274-5A15-41C6-986F-A6A36588A012} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{10771591-D09D-4FCC-990E-3982006FB1FA} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{CEFF8372-2F7A-41CB-8F13-164ABBA8ACA2} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{8830DBE0-2162-4F35-8D81-1577F17ABB10} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{8DD96D02-C6D3-435B-B0F7-2460161A250F} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{91F4EA23-788B-4E54-A38E-FE738B3BF2F1} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{C46BFAA7-F471-45A6-A5AC-FCF9390408EE} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{A24271FA-E058-42E0-BB7D-3C8C43DF4B04} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{31FA18D3-24AD-4AB0-B297-5A2FD871989E} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-		{9921E059-612B-4011-9AB6-FD30E69850A1} = {AA791E28-7914-439A-B59A-580B8D8FE95D}
-		{742AC687-FC9A-4534-BB50-3D91738563A7} = {F44224E5-8E58-4D52-A0F0-BCBA2ADC0A0B}
-	EndGlobalSection
-EndGlobal
diff --git a/Nancy.Next.sln.DotSettings b/Nancy.Next.sln.DotSettings
deleted file mode 100644
index ac259f785d..0000000000
--- a/Nancy.Next.sln.DotSettings
+++ /dev/null
@@ -1,59 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Ecshtml/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BuiltInTypeReferenceStyle/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FElsewhere/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=NancyStandard/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="NancyStandard"&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_IMPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;/Profile&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">All</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_INVOCABLE/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_AUTO_PROPERTY/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_FIELD/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_PROPERTY/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BETWEEN_USING_GROUPS/@EntryValue">0</s:Int64>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOR_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOREACH_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_IFELSE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_USING_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_WHILE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/REDUNDANT_THIS_QUALIFIER_STYLE/@EntryValue">ALWAYS_USE</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">LINE_BREAK</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/QualifiedUsingAtNestedScope/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderRegionName/@EntryValue"></s:String>
-	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"></s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="Aa_bb" /&gt;&lt;/Policy&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
-	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
-    <s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String>
-</wpf:ResourceDictionary>
-
diff --git a/Nancy.sln b/Nancy.sln
index 5a1e80256b..340736a3ee 100644
--- a/Nancy.sln
+++ b/Nancy.sln
@@ -1,874 +1,602 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E944109B-0B7A-4ADE-8602-004CEFA5897D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5734E9DC-CF67-4337-B28E-695280598B88}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{AAB0D92A-7B90-478A-8360-3E6A20BD0B71}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet.config = NuGet.config
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4A24657F-9695-437B-9702-2541ED280628}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{AA791E28-7914-439A-B59A-580B8D8FE95D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy", "src\Nancy.MSBuild\Nancy.csproj", "{34576216-0DCA-4B0F-A0DC-9075E75A676F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{058BCE2A-8F81-4404-83D3-844CE030E513}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor", "src\Nancy.ViewEngines.Razor.MSBuild\Nancy.ViewEngines.Razor.csproj", "{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor.Tests.Models", "test\Nancy.ViewEngines.Razor.Tests.Models\Nancy.ViewEngines.Razor.Tests.Models.csproj", "{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Spark", "src\Nancy.ViewEngines.Spark.MSBuild\Nancy.ViewEngines.Spark.csproj", "{4B7E35DF-1569-4346-B180-A09615723095}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor.Tests", "test\Nancy.ViewEngines.Razor.Tests\Nancy.ViewEngines.Razor.Tests.csproj", "{06B9857A-02A6-430D-B579-98A762C281D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet", "src\Nancy.Hosting.Aspnet.MSBuild\Nancy.Hosting.Aspnet.csproj", "{15B7F794-0BB2-4B66-AD78-4A951F1209B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy", "src\Nancy\Nancy.csproj", "{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Forms", "src\Nancy.Authentication.Forms.MSBuild\Nancy.Authentication.Forms.csproj", "{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Testing", "src\Nancy.Testing\Nancy.Testing.csproj", "{66119997-5949-45D6-9175-F1C7C599A8F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Self", "src\Nancy.Hosting.Self.MSBuild\Nancy.Hosting.Self.csproj", "{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor", "src\Nancy.ViewEngines.Razor\Nancy.ViewEngines.Razor.csproj", "{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Testing", "src\Nancy.Testing.MSBuild\Nancy.Testing.csproj", "{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Forms", "src\Nancy.Authentication.Forms\Nancy.Authentication.Forms.csproj", "{09F5EB90-1063-4338-A146-25F7BE8BFF43}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.DotLiquid", "src\Nancy.ViewEngines.DotLiquid.MSBuild\Nancy.ViewEngines.DotLiquid.csproj", "{B795886D-9D70-45B1-BFB5-AD54CBC9A447}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Markdown.Tests", "test\Nancy.ViewEngines.Markdown.Tests\Nancy.ViewEngines.Markdown.Tests.csproj", "{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Basic", "src\Nancy.Authentication.Basic.MSBuild\Nancy.Authentication.Basic.csproj", "{BD72B98D-C81A-4013-B606-94B4BA2273E5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Markdown", "src\Nancy.ViewEngines.Markdown\Nancy.ViewEngines.Markdown.csproj", "{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Tests", "test\Nancy.Tests.MSBuild\Nancy.Tests.csproj", "{776D244D-BC4D-4BBB-A478-CAF2D04520E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.DotLiquid.Tests", "test\Nancy.ViewEngines.DotLiquid.Tests\Nancy.ViewEngines.DotLiquid.Tests.csproj", "{89C49FF5-9441-4DE8-A33F-1B2852401A54}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor.Tests", "test\Nancy.ViewEngines.Razor.Tests.MSBuild\Nancy.ViewEngines.Razor.Tests.csproj", "{FE32460D-547C-4EB9-A768-541255CCAA83}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.DotLiquid", "src\Nancy.ViewEngines.DotLiquid\Nancy.ViewEngines.DotLiquid.csproj", "{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Spark.Tests", "test\Nancy.ViewEngines.Spark.Tests.MSBuild\Nancy.ViewEngines.Spark.Tests.csproj", "{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.FluentValidation.Tests", "test\Nancy.Validation.FluentValidation.Tests\Nancy.Validation.FluentValidation.Tests.csproj", "{0E9B466C-1151-4AE9-A55A-6377A25F8235}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet.Tests", "test\Nancy.Hosting.Aspnet.Tests.MSBuild\Nancy.Hosting.Aspnet.Tests.csproj", "{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.FluentValidation", "src\Nancy.Validation.FluentValidation\Nancy.Validation.FluentValidation.csproj", "{33D5FB92-074E-4C13-BFD6-21184DD0013A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Forms.Tests", "test\Nancy.Authentication.Forms.Tests.MSBuild\Nancy.Authentication.Forms.Tests.csproj", "{4E974051-38C2-4B5D-A6B1-F265A428A673}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.DataAnnotations.Tests", "test\Nancy.Validation.DataAnnotations.Tests\Nancy.Validation.DataAnnotations.Tests.csproj", "{EF3149F4-59C1-4896-989E-59D9D5F9050A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Testing.Tests", "test\Nancy.Testing.Tests.MSBuild\Nancy.Testing.Tests.csproj", "{8EB9E15A-4B65-4C80-B834-9A7773750666}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.DataAnnotations", "src\Nancy.Validation.DataAnnotations\Nancy.Validation.DataAnnotations.csproj", "{FA2462FE-A439-48C5-976D-491F73C25CE1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.DotLiquid.Tests", "test\Nancy.ViewEngines.DotLiquid.Tests.MSBuild\Nancy.ViewEngines.DotLiquid.Tests.csproj", "{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Tests.Functional", "test\Nancy.Tests.Functional\Nancy.Tests.Functional.csproj", "{7944AA31-16BA-43A8-A9CB-2ED758518C9E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Basic.Tests", "test\Nancy.Authentication.Basic.Tests.MSBuild\Nancy.Authentication.Basic.Tests.csproj", "{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Tests", "test\Nancy.Tests\Nancy.Tests.csproj", "{9C383F09-8936-42ED-B9A6-ED3300AECB1C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Tests.Functional", "test\Nancy.Tests.Functional.MSBuild\Nancy.Tests.Functional.csproj", "{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Testing.Tests", "test\Nancy.Testing.Tests\Nancy.Testing.Tests.csproj", "{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication", "samples\Nancy.Demo.Authentication\Nancy.Demo.Authentication.csproj", "{5F2DD52D-471B-4946-8F7B-F050C88EFC52}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Owin.Tests", "test\Nancy.Owin.Tests\Nancy.Owin.Tests.csproj", "{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.Forms", "samples\Nancy.Demo.Authentication.Forms\Nancy.Demo.Authentication.Forms.csproj", "{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Owin", "src\Nancy.Owin\Nancy.Owin.csproj", "{23C68B10-36FD-41DE-AAA3-77BEDFD63945}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Bootstrapping.Aspnet", "samples\Nancy.Demo.Bootstrapper.Aspnet\Nancy.Demo.Bootstrapping.Aspnet.csproj", "{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Modules.Tests", "test\Nancy.Metadata.Modules.Tests\Nancy.Metadata.Modules.Tests.csproj", "{8302F65E-035F-45D7-B894-915B68B72711}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Caching", "samples\Nancy.Demo.Caching\Nancy.Demo.Caching.csproj", "{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Modules", "src\Nancy.Metadata.Modules\Nancy.Metadata.Modules.csproj", "{89DED7A5-7334-4852-A1FC-9266AD0EF388}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Hosting.Self", "samples\Nancy.Demo.Hosting.Self\Nancy.Demo.Hosting.Self.csproj", "{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Self.Tests", "test\Nancy.Hosting.Self.Tests\Nancy.Hosting.Self.Tests.csproj", "{8909AB97-EDD6-4AB2-B733-A543ACB957CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Hosting.Aspnet", "samples\Nancy.Demo.Hosting.Aspnet\Nancy.Demo.Hosting.Aspnet.csproj", "{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Self", "src\Nancy.Hosting.Self\Nancy.Hosting.Self.csproj", "{AA837BCA-A2D6-4F74-95BC-1F6A66146562}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.Forms.TestingDemo", "samples\Nancy.Demo.Authentication.Forms.TestingDemo\Nancy.Demo.Authentication.Forms.TestingDemo.csproj", "{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet.Tests", "test\Nancy.Hosting.Aspnet.Tests\Nancy.Hosting.Aspnet.Tests.csproj", "{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.ModelBinding", "samples\Nancy.Demo.ModelBinding\Nancy.Demo.ModelBinding.csproj", "{1258BFCD-3BAD-4373-B786-4D698EC3C157}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet", "src\Nancy.Hosting.Aspnet\Nancy.Hosting.Aspnet.csproj", "{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.SuperSimpleViewEngine", "samples\Nancy.Demo.SuperSimpleViewEngine\Nancy.Demo.SuperSimpleViewEngine.csproj", "{4885B9DF-D99C-4A1C-8606-259D32A58C33}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Encryption.MachineKey.Tests", "test\Nancy.Encryption.MachineKey.Tests\Nancy.Encryption.MachineKey.Tests.csproj", "{C42C352E-F3E2-41F6-A446-0CACDA5096AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.SparkViewEngine", "samples\Nancy.Demo.SparkViewEngine\Nancy.Demo.SparkViewEngine.csproj", "{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Encryption.MachineKey", "src\Nancy.Encryption.MachineKey\Nancy.Encryption.MachineKey.csproj", "{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.Basic", "samples\Nancy.Demo.Authentication.Basic\Nancy.Demo.Authentication.Basic.csproj", "{911196F4-B88F-4940-B1FD-D30F5290D06D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Embedded.Tests", "test\Nancy.Embedded.Tests\Nancy.Embedded.Tests.csproj", "{8A936050-5B84-4711-A235-2BA36A445B26}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Nustache", "src\Nancy.ViewEngines.Nustache.MSBuild\Nancy.ViewEngines.Nustache.csproj", "{A1A9E636-A37C-4170-B2E4-99D4F69B415D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Embedded", "src\Nancy.Embedded\Nancy.Embedded.csproj", "{8120B952-D9BC-450A-B691-C030177CD24D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Validation", "samples\Nancy.Demo.Validation\Nancy.Demo.Validation.csproj", "{F417B81C-B914-4BFD-8299-6BBD11072B01}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Forms.Tests", "test\Nancy.Authentication.Forms.Tests\Nancy.Authentication.Forms.Tests.csproj", "{E3C25A1C-2754-4134-8780-1F0A247D6850}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.DataAnnotations", "src\Nancy.Validation.DataAnnotations.MSBuild\Nancy.Validation.DataAnnotations.csproj", "{701765DC-F4F2-4943-A37F-6ED253198158}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Basic.Tests", "test\Nancy.Authentication.Basic.Tests\Nancy.Authentication.Basic.Tests.csproj", "{5323D32E-0CF2-41B6-AF91-37F744AC1554}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.FluentValidation", "src\Nancy.Validation.FluentValidation.MSBuild\Nancy.Validation.FluentValidation.csproj", "{01230F2A-D108-480C-B834-8CE0569FD3B3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Basic", "src\Nancy.Authentication.Basic\Nancy.Authentication.Basic.csproj", "{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.DataAnnotations.Tests", "test\Nancy.Validation.DataAnnotatioins.Tests.MSBuild\Nancy.Validation.DataAnnotations.Tests.csproj", "{8F9F910D-416E-4B28-BE59-D76670405F56}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Spark", "src\Nancy.ViewEngines.Spark\Nancy.ViewEngines.Spark.csproj", "{0E546413-BBF8-40B3-8534-8D1D986AA888}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Validation.FluentValidation.Tests", "test\Nancy.Validation.FluentValidation.Tests.MSBuild\Nancy.Validation.FluentValidation.Tests.csproj", "{FBC35268-377B-4DBE-87E3-B22D1314BEC6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor.BuildProviders", "src\Nancy.ViewEngines.Razor.BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.csproj", "{D92ADA88-361B-480A-81D2-AE1F7B2E0660}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor.Tests.Models", "test\Nancy.ViewEngines.Razor.Tests.Models.MSBuild\Nancy.ViewEngines.Razor.Tests.Models.csproj", "{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Nustache", "src\Nancy.ViewEngines.Nustache\Nancy.ViewEngines.Nustache.csproj", "{4FB42026-81C2-47B3-99A4-751452E64814}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Razor.BuildProviders", "src\Nancy.ViewEngines.Razor.BuildProviders.MSBuild\Nancy.ViewEngines.Razor.BuildProviders.csproj", "{EDF3E264-2D0F-4440-99FF-45D279A598A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Stateless", "src\Nancy.Authentication.Stateless\Nancy.Authentication.Stateless.csproj", "{EEEE504F-24AC-4932-9B28-F684AB20FB50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Self.Tests", "test\Nancy.Hosting.Self.Tests.MSBuild\Nancy.Hosting.Self.Tests.csproj", "{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Hosting.Kestrel", "samples\Nancy.Demo.Hosting.Kestrel\Nancy.Demo.Hosting.Kestrel.csproj", "{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Stateless", "src\Nancy.Authentication.Stateless.MSBuild\Nancy.Authentication.Stateless.csproj", "{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.Stateless.Website", "samples\Nancy.Demo.Authentication.Stateless.Website\Nancy.Demo.Authentication.Stateless.Website.csproj", "{B5E3586D-81DE-49C3-83BC-062684795127}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.Stateless", "samples\Nancy.Demo.Authentication.Stateless\Nancy.Demo.Authentication.Stateless.csproj", "{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Razor.Localization", "samples\Nancy.Demo.Razor.Localization\Nancy.Demo.Razor.Localization.csproj", "{396F0BCE-5B51-4B6A-931E-312880C24725}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Encryption.MachineKey", "src\Nancy.Encryption.MachineKey.MSBuild\Nancy.Encryption.MachineKey.csproj", "{14A66047-5F67-4774-B0E3-195D1D25B6A5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Encryption.MachineKey.Tests", "test\Nancy.Encryption.MachineKey.Tests.MSBuild\Nancy.Encryption.MachineKey.Tests.csproj", "{429873F5-1E53-4ECC-A9EC-7950C789C6DF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.CustomModule", "samples\Nancy.Demo.CustomModule\Nancy.Demo.CustomModule.csproj", "{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Owin", "src\Nancy.Owin.MSBuild\Nancy.Owin.csproj", "{D6B2480C-2A52-4D02-9477-D387D7A486E5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Embedded", "src\Nancy.Embedded.MSBuild\Nancy.Embedded.csproj", "{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Embedded.Tests", "test\Nancy.Embedded.Tests.MSBuild\Nancy.Embedded.Tests.csproj", "{6EED2486-39BF-491D-B033-720DFCFD1211}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.MarkdownViewEngine", "samples\Nancy.Demo.MarkdownViewEngine\Nancy.Demo.MarkdownViewEngine.csproj", "{B6929D0B-5104-4C7E-979D-F4914E813FA6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Markdown.Tests", "test\Nancy.ViewEngines.Markdown.Tests.MSBuild\Nancy.ViewEngines.Markdown.Tests.csproj", "{8EE6F976-F11F-44B3-B065-F5AAA598B30D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Markdown", "src\Nancy.ViewEngines.Markdown.MSBuild\Nancy.ViewEngines.Markdown.csproj", "{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Owin.Tests", "test\Nancy.Owin.Tests.MSBuild\Nancy.Owin.Tests.csproj", "{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.ConstraintRouting", "samples\Nancy.Demo.ConstraintRouting\Nancy.Demo.ConstraintRouting.csproj", "{972C2D45-49B6-4109-9A3A-0C8BC9225B95}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Modules", "src\Nancy.Metadata.Modules.MSBuild\Nancy.Metadata.Modules.csproj", "{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Modules.Tests", "test\Nancy.Metadata.Modules.Tests.MSBuild\Nancy.Metadata.Modules.Tests.csproj", "{508A3A68-2012-4E62-925F-2F3083A013FC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Hosting.Owin", "samples\Nancy.Demo.Hosting.Owin\Nancy.Demo.Hosting.Owin.csproj", "{7959D79C-9E2B-4871-9470-6A6B527ABE5E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.ViewEngines.Spark.Tests", "test\Nancy.ViewEngines.Spark.Tests\Nancy.ViewEngines.Spark.Tests.csproj", "{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		MonoDebug|Any CPU = MonoDebug|Any CPU
-		MonoDebug|x86 = MonoDebug|x86
-		MonoRelease|Any CPU = MonoRelease|Any CPU
-		MonoRelease|x86 = MonoRelease|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}.Release|x86.ActiveCfg = Release|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B7E35DF-1569-4346-B180-A09615723095}.Release|x86.ActiveCfg = Release|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}.Release|x86.ActiveCfg = Release|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}.Release|x86.ActiveCfg = Release|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE32460D-547C-4EB9-A768-541255CCAA83}.Release|x86.ActiveCfg = Release|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}.Release|x86.ActiveCfg = Release|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E974051-38C2-4B5D-A6B1-F265A428A673}.Release|x86.ActiveCfg = Release|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EB9E15A-4B65-4C80-B834-9A7773750666}.Release|x86.ActiveCfg = Release|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}.Release|x86.ActiveCfg = Release|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}.Release|x86.ActiveCfg = Release|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}.Release|x86.ActiveCfg = Release|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52}.Release|x86.ActiveCfg = Release|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F}.Release|x86.ActiveCfg = Release|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837}.Release|x86.ActiveCfg = Release|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02}.Release|x86.ActiveCfg = Release|Any CPU
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Debug|Any CPU.Build.0 = Debug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Debug|x86.ActiveCfg = Debug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Debug|x86.Build.0 = Debug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoDebug|Any CPU.Build.0 = MonoDebug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoDebug|x86.ActiveCfg = MonoDebug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoDebug|x86.Build.0 = MonoDebug|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoRelease|Any CPU.Build.0 = MonoRelease|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoRelease|x86.ActiveCfg = MonoRelease|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.MonoRelease|x86.Build.0 = MonoRelease|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Release|Any CPU.ActiveCfg = Release|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Release|Any CPU.Build.0 = Release|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Release|x86.ActiveCfg = Release|x86
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1}.Release|x86.Build.0 = Release|x86
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A}.Release|x86.ActiveCfg = Release|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B}.Release|x86.ActiveCfg = Release|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157}.Release|x86.ActiveCfg = Release|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{911196F4-B88F-4940-B1FD-D30F5290D06D}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D}.Release|x86.ActiveCfg = Release|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F417B81C-B914-4BFD-8299-6BBD11072B01}.Release|x86.ActiveCfg = Release|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.Release|Any CPU.Build.0 = Release|Any CPU
-		{701765DC-F4F2-4943-A37F-6ED253198158}.Release|x86.ActiveCfg = Release|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01230F2A-D108-480C-B834-8CE0569FD3B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F9F910D-416E-4B28-BE59-D76670405F56}.Release|x86.ActiveCfg = Release|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}.Release|x86.ActiveCfg = Release|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Release|x86.ActiveCfg = Release|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}.Release|x86.ActiveCfg = Release|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5E3586D-81DE-49C3-83BC-062684795127}.Release|x86.ActiveCfg = Release|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC}.Release|x86.ActiveCfg = Release|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.Release|Any CPU.Build.0 = Release|Any CPU
-		{396F0BCE-5B51-4B6A-931E-312880C24725}.Release|x86.ActiveCfg = Release|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.MonoDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.MonoDebug|Any CPU.Build.0 = Debug|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}.Release|x86.ActiveCfg = Release|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.MonoDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.MonoDebug|Any CPU.Build.0 = Debug|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EED2486-39BF-491D-B033-720DFCFD1211}.Release|x86.ActiveCfg = Release|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.MonoDebug|Any CPU.ActiveCfg = MonoDevelop|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.MonoDebug|Any CPU.Build.0 = MonoDevelop|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6}.Release|x86.ActiveCfg = Release|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.MonoDebug|Any CPU.ActiveCfg = MonoDevelop|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.MonoDebug|Any CPU.Build.0 = MonoDevelop|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D}.Release|x86.ActiveCfg = Release|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.MonoDebug|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.MonoDebug|Any CPU.Build.0 = MonoRelease|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}.Release|x86.ActiveCfg = Release|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}.Release|x86.ActiveCfg = Release|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.MonoDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.MonoDebug|Any CPU.Build.0 = Debug|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}.Release|x86.ActiveCfg = Release|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.MonoDebug|Any CPU.ActiveCfg = Debug|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.MonoDebug|Any CPU.Build.0 = Debug|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.MonoDebug|x86.ActiveCfg = Debug|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.MonoRelease|x86.ActiveCfg = Release|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{508A3A68-2012-4E62-925F-2F3083A013FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Debug|x86.Build.0 = Debug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoDebug|x86.ActiveCfg = MonoDebug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoDebug|x86.Build.0 = MonoDebug|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoRelease|x86.ActiveCfg = MonoRelease|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.MonoRelease|x86.Build.0 = MonoRelease|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Release|x86.ActiveCfg = Release|Any CPU
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E}.Release|x86.Build.0 = Release|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Release|x64.Build.0 = Release|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC}.Release|x86.Build.0 = Release|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Release|x64.Build.0 = Release|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{06B9857A-02A6-430D-B579-98A762C281D3}.Release|x86.Build.0 = Release|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Debug|x64.Build.0 = Debug|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Debug|x86.Build.0 = Debug|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Release|x64.ActiveCfg = Release|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Release|x64.Build.0 = Release|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Release|x86.ActiveCfg = Release|Any CPU
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66}.Release|x86.Build.0 = Release|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Debug|x86.Build.0 = Debug|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Release|x64.Build.0 = Release|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{66119997-5949-45D6-9175-F1C7C599A8F5}.Release|x86.Build.0 = Release|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Debug|x64.Build.0 = Debug|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Release|x64.Build.0 = Release|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5}.Release|x86.Build.0 = Release|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Debug|x64.Build.0 = Debug|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Debug|x86.Build.0 = Debug|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Release|x64.ActiveCfg = Release|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Release|x64.Build.0 = Release|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Release|x86.ActiveCfg = Release|Any CPU
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43}.Release|x86.Build.0 = Release|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Debug|x64.Build.0 = Debug|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Debug|x86.Build.0 = Debug|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Release|x64.ActiveCfg = Release|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Release|x64.Build.0 = Release|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Release|x86.ActiveCfg = Release|Any CPU
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391}.Release|x86.Build.0 = Release|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Debug|x64.Build.0 = Debug|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Debug|x86.Build.0 = Debug|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Release|x64.ActiveCfg = Release|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Release|x64.Build.0 = Release|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Release|x86.ActiveCfg = Release|Any CPU
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4}.Release|x86.Build.0 = Release|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Debug|x64.Build.0 = Debug|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Debug|x86.Build.0 = Debug|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Release|x64.ActiveCfg = Release|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Release|x64.Build.0 = Release|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Release|x86.ActiveCfg = Release|Any CPU
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54}.Release|x86.Build.0 = Release|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Debug|x64.Build.0 = Debug|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Debug|x86.Build.0 = Debug|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Release|x64.ActiveCfg = Release|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Release|x64.Build.0 = Release|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89}.Release|x86.Build.0 = Release|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Debug|x64.Build.0 = Debug|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Release|x64.ActiveCfg = Release|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Release|x64.Build.0 = Release|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235}.Release|x86.Build.0 = Release|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Debug|x64.Build.0 = Debug|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Debug|x86.Build.0 = Debug|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Release|x64.ActiveCfg = Release|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Release|x64.Build.0 = Release|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Release|x86.ActiveCfg = Release|Any CPU
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A}.Release|x86.Build.0 = Release|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Release|x64.Build.0 = Release|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A}.Release|x86.Build.0 = Release|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Release|x64.Build.0 = Release|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA2462FE-A439-48C5-976D-491F73C25CE1}.Release|x86.Build.0 = Release|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Debug|x64.Build.0 = Debug|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Release|x64.ActiveCfg = Release|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Release|x64.Build.0 = Release|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E}.Release|x86.Build.0 = Release|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Release|x64.Build.0 = Release|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C}.Release|x86.Build.0 = Release|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Release|x64.Build.0 = Release|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C}.Release|x86.Build.0 = Release|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Debug|x64.Build.0 = Debug|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Debug|x86.Build.0 = Debug|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Release|x64.ActiveCfg = Release|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Release|x64.Build.0 = Release|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Release|x86.ActiveCfg = Release|Any CPU
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522}.Release|x86.Build.0 = Release|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Debug|x64.Build.0 = Debug|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Debug|x86.Build.0 = Debug|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Release|x64.ActiveCfg = Release|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Release|x64.Build.0 = Release|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Release|x86.ActiveCfg = Release|Any CPU
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945}.Release|x86.Build.0 = Release|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Debug|x64.Build.0 = Debug|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Debug|x86.Build.0 = Debug|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Release|x64.ActiveCfg = Release|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Release|x64.Build.0 = Release|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Release|x86.ActiveCfg = Release|Any CPU
+		{8302F65E-035F-45D7-B894-915B68B72711}.Release|x86.Build.0 = Release|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Debug|x64.Build.0 = Debug|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Debug|x86.Build.0 = Debug|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Release|x64.ActiveCfg = Release|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Release|x64.Build.0 = Release|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Release|x86.ActiveCfg = Release|Any CPU
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388}.Release|x86.Build.0 = Release|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Debug|x64.Build.0 = Debug|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Debug|x86.Build.0 = Debug|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Release|x64.ActiveCfg = Release|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Release|x64.Build.0 = Release|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Release|x86.ActiveCfg = Release|Any CPU
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA}.Release|x86.Build.0 = Release|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Debug|x64.Build.0 = Debug|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Debug|x86.Build.0 = Debug|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Release|x64.ActiveCfg = Release|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Release|x64.Build.0 = Release|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562}.Release|x86.Build.0 = Release|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Debug|x64.Build.0 = Debug|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Debug|x86.Build.0 = Debug|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Release|x64.ActiveCfg = Release|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Release|x64.Build.0 = Release|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Release|x86.ActiveCfg = Release|Any CPU
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760}.Release|x86.Build.0 = Release|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Debug|x64.Build.0 = Debug|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Debug|x86.Build.0 = Debug|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Release|x64.ActiveCfg = Release|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Release|x64.Build.0 = Release|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Release|x86.ActiveCfg = Release|Any CPU
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D}.Release|x86.Build.0 = Release|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Debug|x86.Build.0 = Debug|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Release|x64.Build.0 = Release|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF}.Release|x86.Build.0 = Release|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Release|x64.Build.0 = Release|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D}.Release|x86.Build.0 = Release|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Debug|x64.Build.0 = Debug|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Debug|x86.Build.0 = Debug|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Release|x64.ActiveCfg = Release|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Release|x64.Build.0 = Release|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Release|x86.ActiveCfg = Release|Any CPU
+		{8A936050-5B84-4711-A235-2BA36A445B26}.Release|x86.Build.0 = Release|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Debug|x64.Build.0 = Debug|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Debug|x86.Build.0 = Debug|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Release|x64.ActiveCfg = Release|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Release|x64.Build.0 = Release|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Release|x86.ActiveCfg = Release|Any CPU
+		{8120B952-D9BC-450A-B691-C030177CD24D}.Release|x86.Build.0 = Release|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Debug|x64.Build.0 = Debug|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Release|x64.ActiveCfg = Release|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Release|x64.Build.0 = Release|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3C25A1C-2754-4134-8780-1F0A247D6850}.Release|x86.Build.0 = Release|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Debug|x64.Build.0 = Debug|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Debug|x86.Build.0 = Debug|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Release|x64.ActiveCfg = Release|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Release|x64.Build.0 = Release|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Release|x86.ActiveCfg = Release|Any CPU
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554}.Release|x86.Build.0 = Release|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Debug|x64.Build.0 = Debug|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Debug|x86.Build.0 = Debug|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Release|x64.ActiveCfg = Release|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Release|x64.Build.0 = Release|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Release|x86.ActiveCfg = Release|Any CPU
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD}.Release|x86.Build.0 = Release|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Debug|x64.Build.0 = Debug|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Release|x64.ActiveCfg = Release|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Release|x64.Build.0 = Release|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E546413-BBF8-40B3-8534-8D1D986AA888}.Release|x86.Build.0 = Release|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Debug|x64.Build.0 = Debug|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Debug|x86.Build.0 = Debug|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Release|x64.ActiveCfg = Release|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Release|x64.Build.0 = Release|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Release|x86.ActiveCfg = Release|Any CPU
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660}.Release|x86.Build.0 = Release|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Debug|x64.Build.0 = Debug|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Debug|x86.Build.0 = Debug|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Release|x64.ActiveCfg = Release|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Release|x64.Build.0 = Release|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Release|x86.ActiveCfg = Release|Any CPU
+		{4FB42026-81C2-47B3-99A4-751452E64814}.Release|x86.Build.0 = Release|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Debug|x64.Build.0 = Debug|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Debug|x86.Build.0 = Debug|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Release|x64.ActiveCfg = Release|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Release|x64.Build.0 = Release|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Release|x86.ActiveCfg = Release|Any CPU
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50}.Release|x86.Build.0 = Release|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Release|x64.Build.0 = Release|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD}.Release|x86.Build.0 = Release|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Debug|x64.Build.0 = Debug|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Debug|x86.Build.0 = Debug|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Release|x64.ActiveCfg = Release|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Release|x64.Build.0 = Release|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Release|x86.ActiveCfg = Release|Any CPU
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{34576216-0DCA-4B0F-A0DC-9075E75A676F} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{4B7E35DF-1569-4346-B180-A09615723095} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{15B7F794-0BB2-4B66-AD78-4A951F1209B2} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{E8B18958-7C8A-4FBA-AF00-3041C34A20CE} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{D79203C0-B672-4751-9C95-C3AB7D3FEFBE} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{B795886D-9D70-45B1-BFB5-AD54CBC9A447} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{BD72B98D-C81A-4013-B606-94B4BA2273E5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{776D244D-BC4D-4BBB-A478-CAF2D04520E1} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{FE32460D-547C-4EB9-A768-541255CCAA83} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{06F89662-C2F0-4C1D-8581-E0C4A615B7E2} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{D0F1D7F4-0D48-49AE-9E33-005926B58B1D} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{4E974051-38C2-4B5D-A6B1-F265A428A673} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{8EB9E15A-4B65-4C80-B834-9A7773750666} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{2026DD2D-E041-4A14-8A04-D5B39B8B7C40} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{5F2DD52D-471B-4946-8F7B-F050C88EFC52} = {4A24657F-9695-437B-9702-2541ED280628}
-		{98940A30-1B48-4F71-A6BA-85F0AAF31A2F} = {4A24657F-9695-437B-9702-2541ED280628}
-		{EF660223-4DFD-4E36-BF36-9DD6AFB3F837} = {4A24657F-9695-437B-9702-2541ED280628}
-		{28F9EA8B-90F7-4974-BB40-0B7FA9309D02} = {4A24657F-9695-437B-9702-2541ED280628}
-		{0B3EA40E-F7D8-4E14-A30F-1536F41B62D1} = {4A24657F-9695-437B-9702-2541ED280628}
-		{E127FED3-01C0-41BA-BF83-D8DCDD827D6A} = {4A24657F-9695-437B-9702-2541ED280628}
-		{948A8EF6-D50C-45EA-9AFD-7A4723ADAB0B} = {4A24657F-9695-437B-9702-2541ED280628}
-		{1258BFCD-3BAD-4373-B786-4D698EC3C157} = {4A24657F-9695-437B-9702-2541ED280628}
-		{4885B9DF-D99C-4A1C-8606-259D32A58C33} = {4A24657F-9695-437B-9702-2541ED280628}
-		{DE91D085-70DF-4892-B0E3-B849E9BF6AF5} = {4A24657F-9695-437B-9702-2541ED280628}
-		{911196F4-B88F-4940-B1FD-D30F5290D06D} = {4A24657F-9695-437B-9702-2541ED280628}
-		{A1A9E636-A37C-4170-B2E4-99D4F69B415D} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{F417B81C-B914-4BFD-8299-6BBD11072B01} = {4A24657F-9695-437B-9702-2541ED280628}
-		{701765DC-F4F2-4943-A37F-6ED253198158} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{01230F2A-D108-480C-B834-8CE0569FD3B3} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{8F9F910D-416E-4B28-BE59-D76670405F56} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{FBC35268-377B-4DBE-87E3-B22D1314BEC6} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{EDF3E264-2D0F-4440-99FF-45D279A598A9} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{CA24ED85-DD68-4C10-B80A-D81C6745FCB8} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{211560C3-FDDF-46D6-AB0C-F3BC04B173B5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{B5E3586D-81DE-49C3-83BC-062684795127} = {4A24657F-9695-437B-9702-2541ED280628}
-		{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC} = {4A24657F-9695-437B-9702-2541ED280628}
-		{396F0BCE-5B51-4B6A-931E-312880C24725} = {4A24657F-9695-437B-9702-2541ED280628}
-		{14A66047-5F67-4774-B0E3-195D1D25B6A5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{429873F5-1E53-4ECC-A9EC-7950C789C6DF} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4} = {4A24657F-9695-437B-9702-2541ED280628}
-		{D6B2480C-2A52-4D02-9477-D387D7A486E5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{D8EBA39B-63AE-4A66-BD0E-F7F95E572135} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{6EED2486-39BF-491D-B033-720DFCFD1211} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{B6929D0B-5104-4C7E-979D-F4914E813FA6} = {4A24657F-9695-437B-9702-2541ED280628}
-		{8EE6F976-F11F-44B3-B065-F5AAA598B30D} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{864AF449-0902-44FC-BEEE-06BA9A6F4A8F} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{972C2D45-49B6-4109-9A3A-0C8BC9225B95} = {4A24657F-9695-437B-9702-2541ED280628}
-		{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
-		{508A3A68-2012-4E62-925F-2F3083A013FC} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
-		{7959D79C-9E2B-4871-9470-6A6B527ABE5E} = {4A24657F-9695-437B-9702-2541ED280628}
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Nancy.Demo.Hosting.Aspnet\Nancy.Demo.Hosting.Aspnet.csproj
+		{0E7E06C1-C223-4975-A9DB-D338EBF0A9BC} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{06B9857A-02A6-430D-B579-98A762C281D3} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{ADAB2C6B-10FE-4B31-BCD2-E2EFA69D5A66} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{66119997-5949-45D6-9175-F1C7C599A8F5} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{D1D2622E-ACF7-479C-ABC8-E1B94E41D9D5} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{09F5EB90-1063-4338-A146-25F7BE8BFF43} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{1CA8D3D3-B6A6-4006-AA96-671CB41D6391} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{CCB5075B-C50A-4CD1-983A-2D51DC2430F4} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{89C49FF5-9441-4DE8-A33F-1B2852401A54} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{9F16EBDF-4546-43C2-82B8-7D698F7A1E89} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{0E9B466C-1151-4AE9-A55A-6377A25F8235} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{33D5FB92-074E-4C13-BFD6-21184DD0013A} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{EF3149F4-59C1-4896-989E-59D9D5F9050A} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{FA2462FE-A439-48C5-976D-491F73C25CE1} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{7944AA31-16BA-43A8-A9CB-2ED758518C9E} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{9C383F09-8936-42ED-B9A6-ED3300AECB1C} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{5E5AF23F-61F6-4B44-B682-2D141B54DF5C} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{C0A85A7D-9D7F-4A6C-BA33-9E79050CF522} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{23C68B10-36FD-41DE-AAA3-77BEDFD63945} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{8302F65E-035F-45D7-B894-915B68B72711} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{89DED7A5-7334-4852-A1FC-9266AD0EF388} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{8909AB97-EDD6-4AB2-B733-A543ACB957CA} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{AA837BCA-A2D6-4F74-95BC-1F6A66146562} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{53FB25E0-C8CB-4D65-8D94-6FA627BF9760} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{833A65BC-5B37-468D-8BB4-2343CEFDFA5D} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{C42C352E-F3E2-41F6-A446-0CACDA5096AF} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{EF313B39-68CF-45D1-9094-BDDCCAC9DB2D} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{8A936050-5B84-4711-A235-2BA36A445B26} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{8120B952-D9BC-450A-B691-C030177CD24D} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{E3C25A1C-2754-4134-8780-1F0A247D6850} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{5323D32E-0CF2-41B6-AF91-37F744AC1554} = {058BCE2A-8F81-4404-83D3-844CE030E513}
+		{22E99FEC-8DFC-4E87-90EE-BC7F6E988DAD} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{0E546413-BBF8-40B3-8534-8D1D986AA888} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{D92ADA88-361B-480A-81D2-AE1F7B2E0660} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{4FB42026-81C2-47B3-99A4-751452E64814} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{EEEE504F-24AC-4932-9B28-F684AB20FB50} = {5734E9DC-CF67-4337-B28E-695280598B88}
+		{3AF8D59E-D10A-46DE-97A6-0A6C156F22CD} = {AA791E28-7914-439A-B59A-580B8D8FE95D}
+		{08C1D823-E8E1-4D86-8F73-A9F3AE8FEFC7} = {058BCE2A-8F81-4404-83D3-844CE030E513}
 	EndGlobalSection
 EndGlobal
diff --git a/NuGet.config b/NuGet.config
index 843603a7d5..600712bc45 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,10 +2,6 @@
 
 <configuration>
   <packageSources>
-    <!-- add key="CoreCLR Xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" / -->
-    <!-- add key="AspNet CI Feed" value="https://www.myget.org/F/aspnetcirelease/api/v3/index.json" /> -->
-    <add key="myget.org xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
-    <add key="dotnet.myget.org dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build.cake b/build.cake
index b34764539c..0d2c9a9940 100644
--- a/build.cake
+++ b/build.cake
@@ -1,26 +1,24 @@
 // Usings
-using System.Xml;
-using System.Xml.Linq;
-using System.Xml.XPath;
+using System.Text.RegularExpressions;
 
 // Arguments
 var target = Argument<string>("target", "Default");
 var source = Argument<string>("source", null);
 var apiKey = Argument<string>("apikey", null);
 var version = Argument<string>("targetversion", "2.0.0-Pre" + (EnvironmentVariable("APPVEYOR_BUILD_NUMBER") ?? "0"));
-var skipClean = Argument<bool>("skipclean", false);
-var skipTests = Argument<bool>("skiptests", false);
 var nogit = Argument<bool>("nogit", false);
 
 // Variables
-var configuration = IsRunningOnWindows() ? "Release" : "MonoRelease";
-var projectJsonFiles = GetFiles("./src/**/project.json");
+var configuration = "Release";
+var fullFrameworkTarget = "net452";
+var netStandardTarget = "netstandard1.6";
+var netCoreTarget = "netcoreapp1.1";
 
 // Directories
 var output = Directory("build");
 var outputBinaries = output + Directory("binaries");
-var outputBinariesNet452 = outputBinaries + Directory("net452");
-var outputBinariesNetstandard = outputBinaries + Directory("netstandard1.6");
+var outputBinariesNet452 = outputBinaries + Directory(fullFrameworkTarget);
+var outputBinariesNetstandard = outputBinaries + Directory(netStandardTarget);
 var outputPackages = output + Directory("packages");
 var outputNuGet = output + Directory("nuget");
 
@@ -45,83 +43,48 @@ Task("Clean")
             outputBinariesNetstandard
         });
 
-        if(!skipClean) {
-            CleanDirectories("./src/**/" + configuration);
-            CleanDirectories("./test/**/" + configuration);
-            CleanDirectories("./samples/**/" + configuration);
-        }
+        CleanDirectories("./src/**/" + configuration);
+        CleanDirectories("./test/**/" + configuration);
+        CleanDirectories("./samples/**/" + configuration);
     });
 
 Task("Compile")
-    .Description("Builds the solution")
+    .Description("Builds all the projects in the solution")
     .IsDependentOn("Clean")
     .IsDependentOn("Restore-NuGet-Packages")
     .Does(() =>
     {
-        if (IsRunningOnUnix())
-        {
-            var srcProjects = GetFiles("./src/**/*.xproj");
-
-            if (srcProjects.Count == 0)
-            {
-                throw new CakeException("Unable to find any projects to build.");
-            }
-
-            srcProjects = srcProjects - GetFiles("./**/Nancy.Encryption.MachineKey.xproj");
+        var projects =
+            GetFiles("./**/*.csproj") -
+            GetFiles("./samples/**/*.csproj");
 
-            var testProjects = GetFiles("./test/**/*.xproj");
+        if (projects.Count == 0)
+        {
+            throw new CakeException("Unable to find any projects to build.");
+        }
 
-            var dotnetTestProjects = testProjects
-                                 - GetFiles("test/**/Nancy.Embedded.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Encryption.MachineKey.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Hosting.Aspnet.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Hosting.Self.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Owin.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Validation.DataAnnotatioins.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.DotLiquid.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.Markdown.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.Razor.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.Razor.Tests.Models.xproj");
+        foreach(var project in projects)
+        {
+            var content =
+                System.IO.File.ReadAllText(project.FullPath, Encoding.UTF8);
 
-            foreach(var srcProject in srcProjects)
+            if (IsRunningOnUnix() && content.Contains(">" + fullFrameworkTarget + "<"))
             {
-                DotNetCoreBuild(srcProject.GetDirectory().FullPath, new DotNetCoreBuildSettings {
-                    Configuration = configuration,
-                    Verbose = false
-                });
+                Information(project.GetFilename() + " only supports " +fullFrameworkTarget + " and cannot be built on *nix. Skipping.");
+                continue;
             }
 
-            foreach(var testProject in testProjects)
-            {
-                DotNetCoreBuild(testProject.GetDirectory().FullPath, new DotNetCoreBuildSettings {
-                    Configuration = configuration,
-                    Verbose = false,
-                    Framework = "net452",
-                    Runtime = "unix-x64"
-                });
-            }
+            DotNetCoreBuild(project.GetDirectory().FullPath, new DotNetCoreBuildSettings {
+                ArgumentCustomization = args => {
+                    if (IsRunningOnUnix())
+                    {
+                        args.Append(string.Concat("-f ", project.GetDirectory().GetDirectoryName().Contains(".Tests") ? netCoreTarget : netStandardTarget));
+                    }
 
-            foreach(var dotnetTestProject in dotnetTestProjects)
-            {
-                DotNetCoreBuild(dotnetTestProject.GetDirectory().FullPath, new DotNetCoreBuildSettings {
-                    Configuration = configuration,
-                    Verbose = false,
-                    Framework = "netcoreapp1.0"
-                });
-            }
-        }
-        else
-        {
-            var projects = GetFiles("./**/*.xproj");
-            projects = projects
-                                - GetFiles("./**/Nancy.Encryption.MachineKey.xproj");
-            foreach(var project in projects)
-            {
-                DotNetCoreBuild(project.GetDirectory().FullPath, new DotNetCoreBuildSettings {
-                    Configuration = configuration,
-                    Verbose = false
-                });
-            }
+                    return args;
+                },
+                Configuration = configuration
+            });
         }
     });
 
@@ -140,18 +103,15 @@ Task("Package")
     });
 
 Task("Package-NuGet")
-    .Description("Generates NuGet packages for each project that contains a nuspec")
+    .Description("Generates NuGet packages for each project")
     .Does(() =>
     {
-        var projects = GetFiles("./src/**/*.xproj");
-        foreach(var project in projects)
+        foreach(var project in GetFiles("./src/**/*.csproj"))
         {
-            var settings = new DotNetCorePackSettings {
-                Configuration = "Release",
+            DotNetCorePack(project.GetDirectory().FullPath, new DotNetCorePackSettings {
+                Configuration = configuration,
                 OutputDirectory = outputNuGet
-            };
-
-            DotNetCorePack(project.GetDirectory().FullPath, settings);
+            });
         }
     });
 
@@ -161,23 +121,24 @@ Task("Publish")
     .Does(() =>
     {
         // Copy net452 binaries.
-        CopyFiles(GetFiles("src/**/bin/" + configuration + "/net452/*.dll")
-            + GetFiles("src/**/bin/" + configuration + "/net452/*.xml")
-            + GetFiles("src/**/bin/" + configuration + "/net452/*.pdb")
-            + GetFiles("src/**/*.ps1"), outputBinariesNet452);
+        CopyFiles(GetFiles("./src/**/bin/" + configuration + "/" + fullFrameworkTarget + "/*.dll")
+            + GetFiles("./src/**/bin/" + configuration + "/" + fullFrameworkTarget + "/*.xml")
+            + GetFiles("./src/**/bin/" + configuration + "/" + fullFrameworkTarget + "/*.pdb")
+            + GetFiles("./src/**/*.ps1"), outputBinariesNet452);
 
         // Copy netstandard binaries.
-        CopyFiles(GetFiles("src/**/bin/" + configuration + "/netstandard1.6/*.dll")
-            + GetFiles("src/**/bin/" + configuration + "/netstandard1.6/*.xml")
-            + GetFiles("src/**/bin/" + configuration + "/netstandard1.6/*.pdb")
-            + GetFiles("src/**/*.ps1"), outputBinariesNetstandard);
+        CopyFiles(GetFiles("./src/**/bin/" + configuration + "/" + netStandardTarget + "/*.dll")
+            + GetFiles("./src/**/bin/" + configuration + "/" + netStandardTarget + "/*.xml")
+            + GetFiles("./src/**/bin/" + configuration + "/" + netStandardTarget + "/*.pdb")
+            + GetFiles("./src/**/*.ps1"), outputBinariesNetstandard);
     });
 
 Task("Publish-NuGet")
     .Description("Pushes the nuget packages in the nuget folder to a NuGet source. Also publishes the packages into the feeds.")
     .Does(() =>
     {
-        if(string.IsNullOrWhiteSpace(apiKey)) {
+        if(string.IsNullOrWhiteSpace(apiKey))
+        {
             throw new CakeException("No NuGet API key provided. You need to pass in --apikey=\"xyz\"");
         }
 
@@ -195,13 +156,11 @@ Task("Publish-NuGet")
     });
 
 Task("Prepare-Release")
+    .IsDependentOn("Update-Version")
     .Does(() =>
     {
-        // Update version.
-        UpdateProjectJsonVersion(version, projectJsonFiles);
-
         // Add
-        foreach (var file in projectJsonFiles)
+        foreach (var file in GetFiles("./src/**/*.csproj"))
         {
             if (nogit)
             {
@@ -258,30 +217,14 @@ Task("Prepare-Release")
     });
 
 Task("Restore-NuGet-Packages")
-    .Description("Restores NuGet packages")
+    .Description("Restores NuGet packages for all projects")
     .Does(() =>
-        {
-        var settings = new DotNetCoreRestoreSettings
-        {
-            Verbose = false,
-            Verbosity = DotNetCoreRestoreVerbosity.Warning,
-            Sources = new [] {
-                "https://www.myget.org/F/xunit/api/v3/index.json",
-                "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json",
-                "https://dotnet.myget.org/F/cli-deps/api/v3/index.json",
-                "https://api.nuget.org/v3/index.json"
-            }
-        };
-
-        //Restore at root until preview1-002702 bug fixed
-        DotNetCoreRestore("./", settings);
-        //DotNetCoreRestore("./src", settings);
-        //DotNetCoreRestore("./samples", settings);
-        //DotNetCoreRestore("./test", settings);
+    {
+        DotNetCoreRestore();
     });
 
 Task("Tag")
-    .Description("Tags the current release.")
+    .Description("Tags the current release")
     .Does(() =>
     {
         StartProcess("git", new ProcessSettings {
@@ -290,76 +233,51 @@ Task("Tag")
     });
 
 Task("Test")
-    .Description("Executes xUnit tests")
-    .WithCriteria(!skipTests)
+    .Description("Executes unit tests for all projects")
     .IsDependentOn("Compile")
     .Does(() =>
     {
+        /*
+            Exclude Nancy.ViewEngines.Spark.Tests from test execution until their problem
+            with duplicate assembly references (if the same assembly exists more than once
+            in the application domain, it fails to compile the views) has been fixed.
+        */
+
         var projects =
-            GetFiles("./test/**/*.xproj") -
-            GetFiles("./test/**/Nancy.ViewEngines.Razor.Tests.Models.xproj");
+            GetFiles("./test/**/*.csproj") -
+            GetFiles("./test/Nancy.ViewEngines.Spark.Tests/Nancy.ViewEngines.Spark.Tests.csproj");
 
         if (projects.Count == 0)
         {
             throw new CakeException("Unable to find any projects to test.");
         }
 
-        if (IsRunningOnUnix())
+        foreach(var project in projects)
         {
-            projects = projects
-                - GetFiles("./test/**/Nancy.Encryption.MachineKey.Tests.xproj")
-                - GetFiles("./test/**/Nancy.ViewEngines.DotLiquid.Tests.xproj")
-                - GetFiles("./test/**/Nancy.Embedded.Tests.xproj"); //Embedded somehow doesnt get executed on Travis but nothing explicit sets it
-
-            var testProjects = GetFiles("./test/**/*.xproj");
-            var dotnetTestProjects = testProjects
-                                 - GetFiles("test/**/Nancy.Embedded.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Encryption.MachineKey.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Hosting.Aspnet.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Hosting.Self.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Owin.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.Validation.DataAnnotatioins.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.DotLiquid.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.Markdown.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.Razor.Tests.xproj")
-                                 - GetFiles("test/**/Nancy.ViewEngines.Razor.Tests.Models.xproj");
-
-            foreach(var dotnetTestProject in dotnetTestProjects)
+            var content =
+                System.IO.File.ReadAllText(project.FullPath, Encoding.UTF8);
+
+            if (IsRunningOnUnix() && content.Contains(">" + fullFrameworkTarget + "<"))
             {
-                DotNetCoreTest(dotnetTestProject.GetDirectory().FullPath, new DotNetCoreTestSettings {
-                    Configuration = configuration,
-                    Framework = "netcoreapp1.0"
-                });
+                Information(project.GetFilename() + " only supports " +fullFrameworkTarget + " and tests cannot be executed on *nix. Skipping.");
+                continue;
             }
-        }
 
-        foreach(var project in projects)
-        {
-            if (IsRunningOnWindows())
+            var settings = new ProcessSettings {
+                Arguments = string.Concat("xunit -configuration ", configuration, " -nobuild"),
+                WorkingDirectory = project.GetDirectory()
+            };
+
+            if (IsRunningOnUnix())
             {
-                DotNetCoreTest(project.GetDirectory().FullPath, new DotNetCoreTestSettings {
-                    Configuration = configuration
-                });
+                settings.Arguments.Append(string.Concat("-framework ", netCoreTarget));
             }
-            else
+
+            Information("Executing tests for " + project.GetFilename() + " with arguments: " + settings.Arguments.Render());
+
+            if (StartProcess("dotnet", settings) != 0)
             {
-                var dirPath = project.GetDirectory().FullPath;
-                var testFile = project.GetFilenameWithoutExtension();
-
-                var settings = new ProcessSettings {
-                    Arguments =
-                        dirPath + "/bin/" + configuration + "/net452/unix-x64/dotnet-test-xunit.exe" + " " +
-                        dirPath + "/bin/" + configuration + "/net452/unix-x64/" + testFile + ".dll"
-                };
-
-                using(var process = StartAndReturnProcess("mono", settings))
-                {
-                    process.WaitForExit();
-                    if (process.GetExitCode() != 0)
-                    {
-                        throw new Exception("Nancy tests failed.");
-                    }
-                }
+                Error("One or more tests failed during execution of: " + project.GetFilename());
             }
         }
     });
@@ -369,36 +287,30 @@ Task("Update-Version")
     {
         Information("Setting version to " + version);
 
-        if(string.IsNullOrWhiteSpace(version)) {
+        if(string.IsNullOrWhiteSpace(version))
+        {
             throw new CakeException("No version specified! You need to pass in --targetversion=\"x.y.z\"");
         }
 
-        UpdateProjectJsonVersion(version, projectJsonFiles);
-    });
+        var file =
+            MakeAbsolute(File("./src/Directory.Build.props"));
 
-/*
-/ RUN BUILD TARGET
-*/
-
-RunTarget(target);
-
-/*
-/ HELPER FUNCTIONS
-*/
+        Information(file.FullPath);
 
-public static void UpdateProjectJsonVersion(string version, FilePathCollection filePaths)
-{
-    foreach (var file in filePaths)
-    {
         var project =
             System.IO.File.ReadAllText(file.FullPath, Encoding.UTF8);
 
         var projectVersion =
-            new System.Text.RegularExpressions.Regex("(\"version\":\\s*)\".+\"");
+            new Regex(@"<Version>.+<\/Version>");
 
         project =
-            projectVersion.Replace(project, "$1\"" + version + "\"", 1);
+            projectVersion.Replace(project, string.Concat("<Version>", version, "</Version>"));
 
         System.IO.File.WriteAllText(file.FullPath, project, Encoding.UTF8);
-    }
-}
+    });
+
+/*
+/ RUN BUILD TARGET
+*/
+
+RunTarget(target);
diff --git a/build.ps1 b/build.ps1
index 12281454f0..6a991d90f8 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,6 @@
-$CakeVersion = "0.17.0"
-$DotNetVersion = "1.0.0-preview2-003131";
-$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1";
+$CakeVersion = "0.19.4"
+$DotNetVersion = "1.0.3";
+$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.ps1";
 
 # Make sure tools folder exists
 $PSScriptRoot = $pwd
diff --git a/build.sh b/build.sh
index 10a36c5638..285f2daf2b 100755
--- a/build.sh
+++ b/build.sh
@@ -3,10 +3,10 @@
 # Define directories.
 SCRIPT_DIR=$PWD
 TOOLS_DIR=$SCRIPT_DIR/tools
-CAKE_VERSION=0.17.0
+CAKE_VERSION=0.19.4
 CAKE_DLL=$TOOLS_DIR/Cake.CoreCLR.$CAKE_VERSION/Cake.dll
-DOTNET_VERSION=1.0.0-preview2-003131
-DOTNET_INSTRALL_URI=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.sh
+DOTNET_VERSION=1.0.3
+DOTNET_INSTRALL_URI=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.sh
 
 # Make sure the tools folder exist.
 if [ ! -d "$TOOLS_DIR" ]; then
@@ -51,5 +51,8 @@ fi
 # RUN BUILD SCRIPT
 ###########################################################################
 
+# Point net452 to Mono assemblies
+export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
+
 # Start Cake
 exec dotnet "$CAKE_DLL" "$@"
diff --git a/global.json b/global.json
deleted file mode 100644
index ab0426d943..0000000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "projects": [ "src", "test", "samples" ],
-    "sdk": {
-        "version": "1.0.0-preview2-003131"
-    }
-}
diff --git a/samples/Nancy.Demo.Hosting.Kestrel/Nancy.Demo.Hosting.Kestrel.csproj b/samples/Nancy.Demo.Hosting.Kestrel/Nancy.Demo.Hosting.Kestrel.csproj
new file mode 100644
index 0000000000..9c1660b70e
--- /dev/null
+++ b/samples/Nancy.Demo.Hosting.Kestrel/Nancy.Demo.Hosting.Kestrel.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <DebugType>portable</DebugType>
+    <AssemblyName>Nancy.Demo.Hosting.Kestrel</AssemblyName>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../src/Nancy/Nancy.csproj" />
+    <ProjectReference Include="../../src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/Nancy.Demo.Hosting.Kestrel/Nancy.Demo.Hosting.Kestrel.xproj b/samples/Nancy.Demo.Hosting.Kestrel/Nancy.Demo.Hosting.Kestrel.xproj
deleted file mode 100644
index bb4e6f3628..0000000000
--- a/samples/Nancy.Demo.Hosting.Kestrel/Nancy.Demo.Hosting.Kestrel.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>9921e059-612b-4011-9ab6-fd30e69850a1</ProjectGuid>
-    <RootNamespace>Nancy.Demo.Hosting.Kestrel</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Demo.Hosting.Kestrel</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/samples/Nancy.Demo.Hosting.Kestrel/project.json b/samples/Nancy.Demo.Hosting.Kestrel/project.json
deleted file mode 100644
index 85e185a3bb..0000000000
--- a/samples/Nancy.Demo.Hosting.Kestrel/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "buildOptions": {
-        "debugType": "portable",
-        "emitEntryPoint": true
-    },
-    "dependencies": {
-        "Nancy": {
-            "target": "project"
-        },
-        "Nancy.Validation.FluentValidation": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.AspNetCore.Hosting": "1.0.0",
-                "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
-                "Microsoft.AspNetCore.Owin": "1.0.0",
-                "Microsoft.Extensions.Configuration.Binder": "1.0.0",
-                "Microsoft.Extensions.Configuration.Json": "1.0.0",
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.1"
-                }
-            },
-            "imports": [
-                "dotnet54",
-                "portable-net451+win8"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000000..5dc001c29f
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,31 @@
+<Project>
+  <PropertyGroup>
+    <Authors>Andreas Håkansson, Steven Robbins and contributors</Authors>
+    <DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net452' ">true</DisableImplicitFrameworkReferences>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageIconUrl>http://nancyfx.org/nancy-nuget.png</PackageIconUrl>
+    <PackageLicenseUrl>https://github.com/NancyFx/Nancy/blob/master/license.txt</PackageLicenseUrl>
+    <PackageProjectUrl>http://nancyfx.org</PackageProjectUrl>
+    <PackageTags>Nancy</PackageTags>
+    <Version>2.0.0-clinteastwood</Version>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Nancy' ">
+    <ProjectReference Include="../Nancy/Nancy.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <DefineConstants>$(DefineConstants);CORE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj b/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj
deleted file mode 100644
index 179a4afe64..0000000000
--- a/src/Nancy.Authentication.Basic.MSBuild/Nancy.Authentication.Basic.csproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BD72B98D-C81A-4013-B606-94B4BA2273E5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Authentication.Basic</RootNamespace>
-    <AssemblyName>Nancy.Authentication.Basic</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Authentication.Basic.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Authentication.Basic.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Authentication.Basic.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.Authentication.Basic.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Authentication.Basic.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.Authentication.Basic.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic\BasicAuthentication.cs">
-      <Link>BasicAuthentication.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic\BasicAuthenticationConfiguration.cs">
-      <Link>BasicAuthenticationConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic\BasicHttpExtensions.cs">
-      <Link>BasicHttpExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic\IUserValidator.cs">
-      <Link>IUserValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic\UserPromptBehaviour.cs">
-      <Link>UserPromptBehaviour.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Basic.MSBuild/packages.config b/src/Nancy.Authentication.Basic.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Authentication.Basic.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Authentication.Basic.csproj b/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.csproj
new file mode 100644
index 0000000000..e936f61bcf
--- /dev/null
+++ b/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>A basic HTTP authentication provider for Nancy.</Description>
+    <PackageTags>$(PackageTags);Authentication</PackageTags>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.xproj b/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.xproj
deleted file mode 100644
index e0b83a6c10..0000000000
--- a/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>0c3b1176-a01d-4edd-a0b8-17f04c513025</ProjectGuid>
-    <RootNamespace>Nancy.Authentication.Basic</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Authentication.Basic</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Authentication.Basic/project.json b/src/Nancy.Authentication.Basic/project.json
deleted file mode 100644
index 82fba32548..0000000000
--- a/src/Nancy.Authentication.Basic/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "A basic HTTP authentication provider for Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Authentication"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "imports": [
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj b/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj
deleted file mode 100644
index eae8ad1527..0000000000
--- a/src/Nancy.Authentication.Forms.MSBuild/Nancy.Authentication.Forms.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Authentication.Forms</RootNamespace>
-    <AssemblyName>Nancy.Authentication.Forms</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Authentication.Forms.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Authentication.Forms.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Authentication.Forms.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.Authentication.Forms.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Authentication.Forms.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.Authentication.Forms.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Forms\FormsAuthentication.cs">
-      <Link>FormsAuthentication.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Forms\FormsAuthenticationConfiguration.cs">
-      <Link>FormsAuthenticationConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Forms\IUserMapper.cs">
-      <Link>IUserMapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Forms\ModuleExtensions.cs">
-      <Link>ModuleExtensions.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Forms.MSBuild/packages.config b/src/Nancy.Authentication.Forms.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Authentication.Forms.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Authentication.Forms.csproj b/src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.csproj
new file mode 100644
index 0000000000..a98c229e7b
--- /dev/null
+++ b/src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>A forms authentication provider for Nancy.</Description>
+    <PackageTags>$(PackageTags);Authentication</PackageTags>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.xproj b/src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.xproj
deleted file mode 100644
index c846ac6677..0000000000
--- a/src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>52b05c75-46f1-4c1b-b660-edd88ba38924</ProjectGuid>
-    <RootNamespace>Nancy.Authentication.Forms</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Authentication.Forms</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Authentication.Forms/project.json b/src/Nancy.Authentication.Forms/project.json
deleted file mode 100644
index 3ef42523be..0000000000
--- a/src/Nancy.Authentication.Forms/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "A forms authentication provider for Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Authentication"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "imports": [
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj b/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj
deleted file mode 100644
index f63e9852d0..0000000000
--- a/src/Nancy.Authentication.Stateless.MSBuild/Nancy.Authentication.Stateless.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{211560C3-FDDF-46D6-AB0C-F3BC04B173B5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Authentication.Stateless</RootNamespace>
-    <AssemblyName>Nancy.Authentication.Stateless</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Authentication.Stateless.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Authentication.Stateless.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Authentication.Stateless.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <DocumentationFile>bin\MonoDebug\Nancy.Authentication.Stateless.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Authentication.Stateless.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <DocumentationFile>bin\MonoRelease\Nancy.Authentication.Stateless.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Stateless\StatelessAuthentication.cs">
-      <Link>StatelessAuthentication.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Stateless\StatelessAuthenticationConfiguration.cs">
-      <Link>StatelessAuthenticationConfiguration.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Authentication.Stateless.MSBuild/packages.config b/src/Nancy.Authentication.Stateless.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Authentication.Stateless.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Authentication.Stateless.csproj b/src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.csproj
new file mode 100644
index 0000000000..1eb5da1135
--- /dev/null
+++ b/src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>A stateless authentication provider for Nancy.</Description>
+    <PackageTags>$(PackageTags);Authentication</PackageTags>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.xproj b/src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.xproj
deleted file mode 100644
index e4994025db..0000000000
--- a/src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>7c8cd644-8c3e-491d-9583-ccdd352223c8</ProjectGuid>
-    <RootNamespace>Nancy.Authentication.Stateless</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Authentication.Stateless</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Authentication.Stateless/project.json b/src/Nancy.Authentication.Stateless/project.json
deleted file mode 100644
index 768be3e8fa..0000000000
--- a/src/Nancy.Authentication.Stateless/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "A stateless authentication provider for Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Authentication"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "imports": [
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj b/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj
deleted file mode 100644
index 92d40acf8d..0000000000
--- a/src/Nancy.Embedded.MSBuild/Nancy.Embedded.csproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D8EBA39B-63AE-4A66-BD0E-F7F95E572135}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Embedded</RootNamespace>
-    <AssemblyName>Nancy.Embedded</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <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>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Nancy.Embedded.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Embedded\Conventions\EmbeddedStaticContentConventionBuilder.cs">
-      <Link>Conventions\EmbeddedStaticContentConventionBuilder.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Embedded.MSBuild/packages.config b/src/Nancy.Embedded.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Embedded.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Conventions/EmbeddedStaticContentConventionBuilder.cs b/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs
index 9511497a48..06e940ba8f 100644
--- a/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs
+++ b/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs
@@ -80,18 +80,19 @@ private static Func<string, Func<Response>> BuildContentDelegate(NancyContext co
                     return () => null;
                 }
 
-                var transformedRequestPath =
-                     GetSafeRequestPath(requestPath, requestedPath, contentPath);
+                var fullFilePath =
+                    Path.GetFullPath(GetSafeRequestPath(requestPath, requestedPath, contentPath));
 
-                transformedRequestPath =
-                    GetEncodedPath(transformedRequestPath);
+                var relativeFilePath =
+                    ResolveRelativeFilePath(fullFilePath);
 
-                // Resolve relative paths by using c:\ as a fake root path
-                var fileName =
-                    Path.GetFullPath(Path.Combine("c:\\", transformedRequestPath));
+                var fileName = Path.Combine(
+                    Path.DirectorySeparatorChar.ToString(),
+                    GetEncodedPath(relativeFilePath));
 
-                var contentRootPath =
-                    Path.GetFullPath(Path.Combine("c:\\", GetEncodedPath(contentPath)));
+                var contentRootPath = Path.Combine(
+                    Path.DirectorySeparatorChar.ToString(),
+                    GetEncodedPath(contentPath));
 
                 if (!IsWithinContentFolder(contentRootPath, fileName))
                 {
@@ -100,7 +101,7 @@ private static Func<string, Func<Response>> BuildContentDelegate(NancyContext co
                 }
 
                 var resourceName =
-                    Path.GetDirectoryName(assembly.GetName().Name + fileName.Substring(2)).Replace('\\', '.').Replace('-', '_');
+                    Path.GetDirectoryName(assembly.GetName().Name + fileName).Replace(Path.DirectorySeparatorChar, '.').Replace('-', '_');
 
                 fileName =
                     Path.GetFileName(fileName);
@@ -116,6 +117,14 @@ private static Func<string, Func<Response>> BuildContentDelegate(NancyContext co
             };
         }
 
+        private static string ResolveRelativeFilePath(string fullFilePath)
+        {
+            var fileRootPath =
+                Directory.GetDirectoryRoot(fullFilePath);
+
+            return fullFilePath.Substring(fileRootPath.Length);
+        }
+
         private static string GetEncodedPath(string path)
         {
             return PathReplaceRegex.Replace(path.TrimStart(new[] { '/' }), Path.DirectorySeparatorChar.ToString());
diff --git a/src/Nancy.Embedded/Nancy.Embedded.csproj b/src/Nancy.Embedded/Nancy.Embedded.csproj
new file mode 100644
index 0000000000..1534f4b007
--- /dev/null
+++ b/src/Nancy.Embedded/Nancy.Embedded.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Helpers for serving embedded static content with Nancy.</Description>
+    <PackageTags>$(PackageTags);Embedded;Static Content</PackageTags>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nancy.Embedded/Nancy.Embedded.xproj b/src/Nancy.Embedded/Nancy.Embedded.xproj
deleted file mode 100644
index 04bab595ac..0000000000
--- a/src/Nancy.Embedded/Nancy.Embedded.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a4dedd2f-5565-404a-b60f-98217221518d</ProjectGuid>
-    <RootNamespace>Nancy.Embedded</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Embedded</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Embedded/project.json b/src/Nancy.Embedded/project.json
deleted file mode 100644
index 9eaeb1bfe6..0000000000
--- a/src/Nancy.Embedded/project.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Helpers for serving embedded static content with Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Embedded",
-            "Static Content"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "imports": [
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj b/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj
deleted file mode 100644
index d654e91bfc..0000000000
--- a/src/Nancy.Encryption.MachineKey.MSBuild/Nancy.Encryption.MachineKey.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{14A66047-5F67-4774-B0E3-195D1D25B6A5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Encryption.MachineKey</RootNamespace>
-    <AssemblyName>Nancy.Encryption.MachineKey</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <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>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Nancy.Encryption.MachineKey.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoDebug\Nancy.Encryption.MachineKey.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoRelease\Nancy.Encryption.MachineKey.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Encryption.MachineKey\MachineKeyCryptographyConfigurations.cs">
-      <Link>MachineKeyCryptographyConfigurations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Encryption.MachineKey\MachineKeyEncryptionProvider.cs">
-      <Link>MachineKeyEncryptionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Encryption.MachineKey\MachineKeyHmacProvider.cs">
-      <Link>MachineKeyHmacProvider.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Encryption.MachineKey.MSBuild/packages.config b/src/Nancy.Encryption.MachineKey.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Encryption.MachineKey.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Encryption.MachineKey.csproj b/src/Nancy.Encryption.MachineKey/Nancy.Encryption.MachineKey.csproj
new file mode 100644
index 0000000000..582411bc13
--- /dev/null
+++ b/src/Nancy.Encryption.MachineKey/Nancy.Encryption.MachineKey.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>System.Web MachineKey encrypton and HMAC providers for Nancy.</Description>
+    <PackageTags>$(PackageTags);Encryption</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Encryption.MachineKey/Nancy.Encryption.MachineKey.xproj b/src/Nancy.Encryption.MachineKey/Nancy.Encryption.MachineKey.xproj
deleted file mode 100644
index 1bc5625ddd..0000000000
--- a/src/Nancy.Encryption.MachineKey/Nancy.Encryption.MachineKey.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>186cab00-195d-490f-873b-0b2b0fb546f2</ProjectGuid>
-    <RootNamespace>Nancy.Encryption.MachineKey</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Encryption.MachineKey</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Encryption.MachineKey/project.json b/src/Nancy.Encryption.MachineKey/project.json
deleted file mode 100644
index 4eb139b944..0000000000
--- a/src/Nancy.Encryption.MachineKey/project.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "System.Web MachineKey encrypton and HMAC providers for Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Encryption"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Configuration": {
-                    "type": "build"
-                },
-                "System.Web": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj b/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj
deleted file mode 100644
index 0fab681ac3..0000000000
--- a/src/Nancy.Hosting.Aspnet.MSBuild/Nancy.Hosting.Aspnet.csproj
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{15B7F794-0BB2-4B66-AD78-4A951F1209B2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Hosting.Aspnet</RootNamespace>
-    <AssemblyName>Nancy.Hosting.Aspnet</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Hosting.Aspnet.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Hosting.Aspnet.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Hosting.Aspnet.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.Hosting.Aspnet.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Hosting.Aspnet.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.Hosting.Aspnet.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\AspNetRootPathProvider.cs">
-      <Link>AspNetRootPathProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\BootstrapperEntry.cs">
-      <Link>BootstrapperEntry.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\DefaultNancyAspNetBootstrapper.cs">
-      <Link>DefaultNancyAspNetBootstrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\NancyFxSection.cs">
-      <Link>NancyFxSection.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\NancyHandler.cs">
-      <Link>NancyHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\NancyHttpRequestHandler.cs">
-      <Link>NancyHttpRequestHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\NancyResponseStream.cs">
-      <Link>NancyResponseStream.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet\TinyIoCAspNetExtensions.cs">
-      <Link>TinyIoCAspNetExtensions.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Hosting.Aspnet.MSBuild/packages.config b/src/Nancy.Hosting.Aspnet.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Hosting.Aspnet.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Hosting.Aspnet.csproj b/src/Nancy.Hosting.Aspnet/Nancy.Hosting.Aspnet.csproj
new file mode 100644
index 0000000000..6a00e8a187
--- /dev/null
+++ b/src/Nancy.Hosting.Aspnet/Nancy.Hosting.Aspnet.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables hosting Nancy on ASP.NET.</Description>
+    <PackageTags>$(PackageTags);Host</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update=".\web.config.transform">
+      <PackagePath>content</PackagePath>
+      <Pack>true</Pack>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Hosting.Aspnet/Nancy.Hosting.Aspnet.xproj b/src/Nancy.Hosting.Aspnet/Nancy.Hosting.Aspnet.xproj
deleted file mode 100644
index ad6ce879f9..0000000000
--- a/src/Nancy.Hosting.Aspnet/Nancy.Hosting.Aspnet.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>4262ab60-e51d-43d1-ae63-d60ed24cf04f</ProjectGuid>
-    <RootNamespace>Nancy.Hosting.Aspnet</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Hosting.Aspnet</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Hosting.Aspnet/project.json b/src/Nancy.Hosting.Aspnet/project.json
deleted file mode 100644
index c45925cbdf..0000000000
--- a/src/Nancy.Hosting.Aspnet/project.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables hosting Nancy on ASP.NET.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Host"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png",
-        "files": {
-            "mappings": {
-                "content/web.config.transform": "./web.config.transform"
-            }
-        }
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Configuration": {
-                    "type": "build"
-                },
-                "System.Web": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj b/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj
deleted file mode 100644
index eaff35b985..0000000000
--- a/src/Nancy.Hosting.Self.MSBuild/Nancy.Hosting.Self.csproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Hosting.Self</RootNamespace>
-    <AssemblyName>Nancy.Hosting.Self</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Hosting.Self.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Hosting.Self.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Hosting.Self.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.Hosting.Self.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Hosting.Self.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.Hosting.Self.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\IgnoredHeaders.cs">
-      <Link>IgnoredHeaders.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\Properties\InternalsVisibleTo.cs">
-      <Link>Properties\InternalsVisibleTo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\UrlReservations.cs">
-      <Link>UrlReservations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\UacHelper.cs">
-      <Link>UacHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\FileSystemRootPathProvider.cs">
-      <Link>FileSystemRootPathProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\HostConfiguration.cs">
-      <Link>HostConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\NancyHost.cs">
-      <Link>NancyHost.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\NetSh.cs">
-      <Link>NetSh.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\AutomaticUrlReservationCreationFailureException.cs">
-      <Link>AutomaticUrlReservationCreationFailureException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self\UriExtensions.cs">
-      <SubType>Code</SubType>
-      <Link>UriExtensions.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Hosting.Self.MSBuild/packages.config b/src/Nancy.Hosting.Self.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Hosting.Self.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Hosting.Self.csproj b/src/Nancy.Hosting.Self/Nancy.Hosting.Self.csproj
new file mode 100644
index 0000000000..e82ad91fe5
--- /dev/null
+++ b/src/Nancy.Hosting.Self/Nancy.Hosting.Self.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables hosting Nancy in any application.</Description>
+    <PackageTags>$(PackageTags);Host</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nancy.Hosting.Self/Nancy.Hosting.Self.xproj b/src/Nancy.Hosting.Self/Nancy.Hosting.Self.xproj
deleted file mode 100644
index 4d06522818..0000000000
--- a/src/Nancy.Hosting.Self/Nancy.Hosting.Self.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a3a80c91-557a-44de-bd0f-ac3e96903424</ProjectGuid>
-    <RootNamespace>Nancy.Hosting.Self</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Hosting.Self</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Hosting.Self/project.json b/src/Nancy.Hosting.Self/project.json
deleted file mode 100644
index c4c3b7578e..0000000000
--- a/src/Nancy.Hosting.Self/project.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables hosting Nancy in any application.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Host"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "define": [
-            "CORE"
-        ],
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.MSBuild/Nancy.csproj b/src/Nancy.MSBuild/Nancy.csproj
deleted file mode 100644
index 48efcfc091..0000000000
--- a/src/Nancy.MSBuild/Nancy.csproj
+++ /dev/null
@@ -1,1537 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy</RootNamespace>
-    <AssemblyName>Nancy</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <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>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Nancy.XML</DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\AppDomainAssemblyCatalog.cs">
-      <Link>AppDomainAssemblyCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\AsyncNamedPipelineBase.cs">
-      <Link>AsyncNamedPipelineBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\IRequestStartup.cs">
-      <Link>Bootstrapper\IRequestStartup.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\Registrations.cs">
-      <Link>Bootstrapper\Registrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\BootstrapperException.cs">
-      <Link>Bootstrapper\BootstrapperException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\CollectionTypeRegistration.cs">
-      <Link>Bootstrapper\CollectionTypeRegistration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\ContainerRegistration.cs">
-      <Link>Bootstrapper\ContainerRegistration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\FavIconApplicationStartup.cs">
-      <Link>Bootstrapper\FavIconApplicationStartup.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\IRegistrations.cs">
-      <Link>Bootstrapper\IRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\IPipelines.cs">
-      <Link>Bootstrapper\IPipelines.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\InstanceRegistration.cs">
-      <Link>Bootstrapper\InstanceRegistration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\IApplicationStartup.cs">
-      <Link>Bootstrapper\IApplicationStartup.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\Lifetime.cs">
-      <Link>Bootstrapper\Lifetime.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\MultipleRootPathProvidersLocatedException.cs">
-      <Link>Bootstrapper\MultipleRootPathProvidersLocatedException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\NancyInternalConfiguration.cs">
-      <Link>Bootstrapper\NancyInternalConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\Pipelines.cs">
-      <Link>Bootstrapper\Pipelines.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\DefaultNancyEnvironment.cs">
-      <Link>Configuration\DefaultNancyEnvironment.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\DefaultNancyEnvironmentConfigurator.cs">
-      <Link>Configuration\DefaultNancyEnvironmentConfigurator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\DefaultNancyEnvironmentFactory.cs">
-      <Link>Configuration\DefaultNancyEnvironmentFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\INancyDefaultConfigurationProvider.cs">
-      <Link>Configuration\INancyDefaultConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\INancyEnvironmentConfigurator.cs">
-      <Link>Configuration\INancyEnvironmentConfigurator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\INancyEnvironment.cs">
-      <Link>Configuration\INancyEnvironment.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\INancyEnvironmentFactory.cs">
-      <Link>Configuration\INancyEnvironmentFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\INancyEnvironmentExtensions.cs">
-      <Link>Configuration\INancyEnvironmentExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\NancyDefaultConfigurationProvider.cs">
-      <Link>Configuration\NancyDefaultConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\AcceptHeaderCoercionConventions.cs">
-      <Link>Conventions\AcceptHeaderCoercionConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\BuiltInAcceptHeaderCoercions.cs">
-      <Link>Conventions\BuiltInAcceptHeaderCoercions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\BuiltInCultureConventions.cs">
-      <Link>Conventions\BuiltInCultureConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\CultureConventions.cs">
-      <Link>Conventions\CultureConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\DefaultAcceptHeaderCoercionConventions.cs">
-      <Link>Conventions\DefaultAcceptHeaderCoercionConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\DefaultCultureConventions.cs">
-      <Link>Conventions\DefaultCultureConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\DefaultStaticContentsConventions.cs">
-      <Link>Conventions\DefaultStaticContentsConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\DefaultViewLocationConventions.cs">
-      <Link>Conventions\DefaultViewLocationConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\IConvention.cs">
-      <Link>Conventions\IConvention.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\NancyConventions.cs">
-      <Link>Conventions\NancyConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\StaticContentConventionBuilder.cs">
-      <Link>Conventions\StaticContentConventionBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\StaticContentHelper.cs">
-      <Link>Conventions\StaticContentHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\StaticContentsConventions.cs">
-      <Link>Conventions\StaticContentsConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\StaticContentsConventionsExtensions.cs">
-      <Link>Conventions\StaticContentsConventionsExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\StaticDirectoryContent.cs">
-      <Link>Conventions\StaticDirectoryContent.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\StaticFileContent.cs">
-      <Link>Conventions\StaticFileContent.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Culture\DefaultCultureService.cs">
-      <Link>Culture\DefaultCultureService.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Culture\ICultureService.cs">
-      <Link>Culture\ICultureService.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultResponseFormatterFactory.cs">
-      <Link>DefaultResponseFormatterFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultRootPathProvider.cs">
-      <Link>DefaultRootPathProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ArrayCache.cs">
-      <Link>ArrayCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultRouteConfigurationProvider.cs">
-      <Link>DefaultRouteConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultRuntimeEnvironmentInformation.cs">
-      <Link>DefaultRuntimeEnvironmentInformation.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultSerializerFactory.cs">
-      <Link>DefaultSerializerFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultStaticContentProvider.cs">
-      <Link>DefaultStaticContentProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultTraceConfigurationProvider.cs">
-      <Link>DefaultTraceConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultTypeCatalog.cs">
-      <Link>DefaultTypeCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultViewConfigurationProvider.cs">
-      <Link>DefaultViewConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DefaultRequestTraceFactory.cs">
-      <Link>Diagnostics\DefaultRequestTraceFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DefaultTraceLog.cs">
-      <Link>Diagnostics\DefaultTraceLog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsConfiguration.cs">
-      <Link>Diagnostics\DiagnosticsConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsConfigurationExtensions.cs">
-      <Link>Diagnostics\DiagnosticsConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DefaultDiagnosticsConfigurationProvider.cs">
-      <Link>Diagnostics\DefaultDiagnosticsConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsSerializerFactory.cs">
-      <Link>Diagnostics\DiagnosticsSerializerFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsSession.cs">
-      <Link>Diagnostics\DiagnosticsSession.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\ConcurrentLimitedCollection.cs">
-      <Link>Diagnostics\ConcurrentLimitedCollection.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DisabledDiagnostics.cs">
-      <Link>Diagnostics\DisabledDiagnostics.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\IDiagnostics.cs">
-      <Link>Diagnostics\IDiagnostics.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\IRequestTrace.cs">
-      <Link>Diagnostics\IRequestTrace.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\IRequestTraceFactory.cs">
-      <Link>Diagnostics\IRequestTraceFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\ITraceLog.cs">
-      <Link>Diagnostics\ITraceLog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\NullLog.cs">
-      <Link>Diagnostics\NullLog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\RequestData.cs">
-      <Link>Diagnostics\RequestData.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\ResponseData.cs">
-      <Link>Diagnostics\ResponseData.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DisabledStaticContentProvider.cs">
-      <Link>DisabledStaticContentProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ErrorHandling\RouteExecutionEarlyExitException.cs">
-      <Link>ErrorHandling\RouteExecutionEarlyExitException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\MemoryStreamExtensions.cs">
-      <Link>Extensions\MemoryStreamExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\ModelValidationErrorExtensions.cs">
-      <Link>Extensions\ModelValidationErrorExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\StreamExtensions.cs">
-      <Link>Extensions\StreamExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\TypeExtensions.cs">
-      <Link>Extensions\TypeExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DefaultRequestTracing.cs">
-      <Link>Diagnostics\DefaultRequestTracing.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DescriptionAttribute.cs">
-      <Link>Diagnostics\DescriptionAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticModule.cs">
-      <Link>Diagnostics\DiagnosticModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsHook.cs">
-      <Link>Diagnostics\DiagnosticsHook.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsModuleBuilder.cs">
-      <Link>Diagnostics\DiagnosticsModuleBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsModuleCatalog.cs">
-      <Link>Diagnostics\DiagnosticsModuleCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DefaultDiagnostics.cs">
-      <Link>Diagnostics\DefaultDiagnostics.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DiagnosticsViewRenderer.cs">
-      <Link>Diagnostics\DiagnosticsViewRenderer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\CacheHelpers.cs">
-      <Link>Helpers\CacheHelpers.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\ExceptionExtensions.cs">
-      <Link>Helpers\ExceptionExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\ProxyNancyReferenceProber.cs">
-      <Link>Helpers\ProxyNancyReferenceProber.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>
-    <Compile Include="..\Nancy\IncludeInNancyAssemblyScanningAttribute.cs">
-      <Link>IncludeInNancyAssemblyScanningAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IRuntimeEnvironmentInformation.cs">
-      <Link>IRuntimeEnvironmentInformation.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ISerializerFactory.cs">
-      <Link>ISerializerFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IStaticContentProvider.cs">
-      <Link>IStaticContentProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ITypeCatalog.cs">
-      <Link>ITypeCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\Simple\NancySerializationStrategy.cs">
-      <Link>Json\Simple\NancySerializationStrategy.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\Simple\SimpleJson.cs">
-      <Link>Json\Simple\SimpleJson.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Properties\InternalsVisibleTo.cs">
-      <Link>Properties\InternalsVisibleTo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\TypeCatalogExtensions.cs">
-      <Link>TypeCatalogExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\Converters\TupleConverter.cs">
-      <Link>Json\Converters\TupleConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\DefaultJsonConfigurationProvider.cs">
-      <Link>Json\DefaultJsonConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\JavaScriptPrimitiveConverter.cs">
-      <Link>Json\JavaScriptPrimitiveConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\JsonConfigurationExtensions.cs">
-      <Link>Json\JsonConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Localization\TextResourceFinder.cs">
-      <Link>Localization\TextResourceFinder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\TaskHelpers.cs">
-      <Link>Helpers\TaskHelpers.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\BindingConfig.cs">
-      <Link>ModelBinding\BindingConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\BindingMemberInfo.cs">
-      <Link>ModelBinding\BindingMemberInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultConverters\DateTimeConverter.cs">
-      <Link>ModelBinding\DefaultConverters\DateTimeConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultConverters\NumericConverter.cs">
-      <Link>ModelBinding\DefaultConverters\NumericConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\ExpressionExtensions.cs">
-      <Link>ModelBinding\ExpressionExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\PropertyBindingException.cs">
-      <Link>ModelBinding\PropertyBindingException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\INancyModule.cs">
-      <Link>INancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NancyEngineExtensions.cs">
-      <Link>NancyEngineExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NegotiatorExtensions.cs">
-      <Link>NegotiatorExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Owin\DelegateExtensions.cs">
-      <Link>Owin\DelegateExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Owin\NancyContextExtensions.cs">
-      <Link>Owin\NancyContextExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Owin\NancyOptions.cs">
-      <Link>Owin\NancyOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Owin\NancyOptionsExtensions.cs">
-      <Link>Owin\NancyOptionsExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Owin\NancyMiddleware.cs">
-      <Link>Owin\NancyMiddleware.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\EmbeddedFileResponse.cs">
-      <Link>Responses\EmbeddedFileResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\IDiagnosticsProvider.cs">
-      <Link>Diagnostics\IDiagnosticsProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\IInteractiveDiagnostics.cs">
-      <Link>Diagnostics\IInteractiveDiagnostics.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\InteractiveDiagnostic.cs">
-      <Link>Diagnostics\InteractiveDiagnostic.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\InteractiveDiagnosticMethod.cs">
-      <Link>Diagnostics\InteractiveDiagnosticMethod.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\InteractiveDiagnostics.cs">
-      <Link>Diagnostics\InteractiveDiagnostics.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\Modules\InfoModule.cs">
-      <Link>Diagnostics\Modules\InfoModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\Modules\SettingsModule.cs">
-      <Link>Diagnostics\Modules\SettingsModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\Modules\InteractiveModule.cs">
-      <Link>Diagnostics\Modules\InteractiveModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\Modules\MainModule.cs">
-      <Link>Diagnostics\Modules\MainModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\Modules\TraceModule.cs">
-      <Link>Diagnostics\Modules\TraceModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\TemplateAttribute.cs">
-      <Link>Diagnostics\TemplateAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\TestingDiagnosticProvider.cs">
-      <Link>Diagnostics\TestingDiagnosticProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IResponseFormatterFactory.cs">
-      <Link>IResponseFormatterFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Jsonp.cs">
-      <Link>Jsonp.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\JsonpApplicationStartup.cs">
-      <Link>JsonpApplicationStartup.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\RequestExecutionException.cs">
-      <Link>RequestExecutionException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\MaterialisingResponse.cs">
-      <Link>Responses\MaterialisingResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\NegotiatedResponse.cs">
-      <Link>Responses\NegotiatedResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\DefaultResponseNegotiator.cs">
-      <Link>Responses\Negotiation\DefaultResponseNegotiator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\IResponseNegotiator.cs">
-      <Link>Responses\Negotiation\IResponseNegotiator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\IResponseProcessor.cs">
-      <Link>Responses\Negotiation\IResponseProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\JsonProcessor.cs">
-      <Link>Responses\Negotiation\JsonProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\MatchResult.cs">
-      <Link>Responses\Negotiation\MatchResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\MediaRange.cs">
-      <Link>Responses\Negotiation\MediaRange.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\MediaRangeParameters.cs">
-      <Link>Responses\Negotiation\MediaRangeParameters.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\MediaType.cs">
-      <Link>Responses\Negotiation\MediaType.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\NegotiationContext.cs">
-      <Link>Responses\Negotiation\NegotiationContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\Negotiator.cs">
-      <Link>Responses\Negotiation\Negotiator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\ProcessorMatch.cs">
-      <Link>Responses\Negotiation\ProcessorMatch.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\ResponseProcessor.cs">
-      <Link>Responses\Negotiation\ResponseProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\ViewProcessor.cs">
-      <Link>Responses\Negotiation\ViewProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\Negotiation\XmlProcessor.cs">
-      <Link>Responses\Negotiation\XmlProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\NotAcceptableResponse.cs">
-      <Link>Responses\NotAcceptableResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\StreamResponse.cs">
-      <Link>Responses\StreamResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IO\UnclosableStreamWrapper.cs">
-      <Link>IO\UnclosableStreamWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ISerializer.cs">
-      <Link>ISerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\Converters\TimeSpanConverter.cs">
-      <Link>Json\Converters\TimeSpanConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\JsonConfiguration.cs">
-      <Link>Json\JsonConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\DefaultJsonSerializer.cs">
-      <Link>Responses\DefaultJsonSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\DefaultXmlSerializer.cs">
-      <Link>Responses\DefaultXmlSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\TextResponse.cs">
-      <Link>Responses\TextResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\RouteConfiguration.cs">
-      <Link>RouteConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\RouteConfigurationExtensions.cs">
-      <Link>RouteConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\AlphaRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\AlphaRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\BoolRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\BoolRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\CustomDateTimeRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\CustomDateTimeRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\DateTimeRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\DateTimeRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\DecimalRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\DecimalRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\GuidRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\GuidRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\LongRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\LongRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\IntRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\IntRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\IRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\IRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\LengthRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\LengthRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\MaxLengthRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\MaxLengthRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\MaxRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\MaxRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\MinLengthRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\MinLengthRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\MinRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\MinRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\RangeRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\RangeRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\RouteSegmentConstraintBase.cs">
-      <Link>Routing\Constraints\RouteSegmentConstraintBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\ParameterizedRouteSegmentConstraintBase.cs">
-      <Link>Routing\Constraints\ParameterizedRouteSegmentConstraintBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Constraints\VersionRouteSegmentConstraint.cs">
-      <Link>Routing\Constraints\VersionRouteSegmentConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultRequestDispatcher.cs">
-      <Link>Routing\DefaultRequestDispatcher.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultRouteDescriptionProvider.cs">
-      <Link>Routing\DefaultRouteDescriptionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultRouteInvoker.cs">
-      <Link>Routing\DefaultRouteInvoker.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultRouteSegmentExtractor.cs">
-      <Link>Routing\DefaultRouteSegmentExtractor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRequestDispatcher.cs">
-      <Link>Routing\IRequestDispatcher.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteDescriptionProvider.cs">
-      <Link>Routing\IRouteDescriptionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteInvoker.cs">
-      <Link>Routing\IRouteInvoker.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteMetadataProvider.cs">
-      <Link>Routing\IRouteMetadataProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteSegmentExtractor.cs">
-      <Link>Routing\IRouteSegmentExtractor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\ParameterSegmentInformation.cs">
-      <Link>Routing\ParameterSegmentInformation.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\ResolveResult.cs">
-      <Link>Routing\ResolveResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\OptionsRoute.cs">
-      <Link>Routing\OptionsRoute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\RouteCacheExtensions.cs">
-      <Link>Routing\RouteCacheExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\RouteMetadata.cs">
-      <Link>Routing\RouteMetadata.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\RouteMetadataProvider.cs">
-      <Link>Routing\RouteMetadataProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\IRouteResolverTrie.cs">
-      <Link>Routing\Trie\IRouteResolverTrie.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\ITrieNodeFactory.cs">
-      <Link>Routing\Trie\ITrieNodeFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\MatchResult.cs">
-      <Link>Routing\Trie\MatchResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\NodeData.cs">
-      <Link>Routing\Trie\NodeData.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\NodeDataExtensions.cs">
-      <Link>Routing\Trie\NodeDataExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\CaptureNode.cs">
-      <Link>Routing\Trie\Nodes\CaptureNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\CaptureNodeWithConstraint.cs">
-      <Link>Routing\Trie\Nodes\CaptureNodeWithConstraint.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\CaptureNodeWithDefaultValue.cs">
-      <Link>Routing\Trie\Nodes\CaptureNodeWithDefaultValue.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\CaptureNodeWithMultipleParameters.cs">
-      <Link>Routing\Trie\Nodes\CaptureNodeWithMultipleParameters.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\GreedyRegExCaptureNode.cs">
-      <Link>Routing\Trie\Nodes\GreedyRegExCaptureNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\GreedyCaptureNode.cs">
-      <Link>Routing\Trie\Nodes\GreedyCaptureNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\LiteralNode.cs">
-      <Link>Routing\Trie\Nodes\LiteralNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\OptionalCaptureNode.cs">
-      <Link>Routing\Trie\Nodes\OptionalCaptureNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\RegExNode.cs">
-      <Link>Routing\Trie\Nodes\RegExNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\RootNode.cs">
-      <Link>Routing\Trie\Nodes\RootNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\Nodes\TrieNode.cs">
-      <Link>Routing\Trie\Nodes\TrieNode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\RouteResolverTrie.cs">
-      <Link>Routing\Trie\RouteResolverTrie.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\SegmentMatch.cs">
-      <Link>Routing\Trie\SegmentMatch.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Trie\TrieNodeFactory.cs">
-      <Link>Routing\Trie\TrieNodeFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\TypeResolveStrategies.cs">
-      <Link>TypeResolveStrategies.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\TypeResolveStrategy.cs">
-      <Link>TypeResolveStrategy.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\SSLProxy.cs">
-      <Link>Security\SSLProxy.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Session\CookieBasedSessionsConfiguration.cs">
-      <Link>Session\CookieBasedSessionsConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\StaticContent.cs">
-      <Link>StaticContent.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Conventions\ViewLocationConventions.cs">
-      <Link>Conventions\ViewLocationConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\Base64Helpers.cs">
-      <Link>Cryptography\Base64Helpers.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\CryptographyConfiguration.cs">
-      <Link>Cryptography\CryptographyConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\DefaultHmacProvider.cs">
-      <Link>Cryptography\DefaultHmacProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\HmacComparer.cs">
-      <Link>Cryptography\HmacComparer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\IHmacProvider.cs">
-      <Link>Cryptography\IHmacProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\IKeyGenerator.cs">
-      <Link>Cryptography\IKeyGenerator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\NoEncryptionProvider.cs">
-      <Link>Cryptography\NoEncryptionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\PassphraseKeyGenerator.cs">
-      <Link>Cryptography\PassphraseKeyGenerator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\RandomKeyGenerator.cs">
-      <Link>Cryptography\RandomKeyGenerator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultNancyContextFactory.cs">
-      <Link>DefaultNancyContextFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\RequestTraceSession.cs">
-      <Link>Diagnostics\RequestTraceSession.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\IRequestTracing.cs">
-      <Link>Diagnostics\IRequestTracing.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Diagnostics\DefaultRequestTrace.cs">
-      <Link>Diagnostics\DefaultRequestTrace.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DynamicDictionaryValue.cs">
-      <Link>DynamicDictionaryValue.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ErrorHandling\DefaultStatusCodeHandler.cs">
-      <Link>ErrorHandling\DefaultStatusCodeHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IStatusCodeHandler.cs">
-      <Link>IStatusCodeHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ErrorPipeline.cs">
-      <Link>ErrorPipeline.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\AssemblyExtensions.cs">
-      <Link>Extensions\AssemblyExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\INancyBootstrapper.cs">
-      <Link>Bootstrapper\INancyBootstrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\ModuleRegistrationType.cs">
-      <Link>Bootstrapper\ModuleRegistrationType.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\NancyBootstrapperBase.cs">
-      <Link>Bootstrapper\NancyBootstrapperBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\NancyBootstrapperLocator.cs">
-      <Link>Bootstrapper\NancyBootstrapperLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\TypeRegistration.cs">
-      <Link>Bootstrapper\TypeRegistration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cookies\NancyCookie.cs">
-      <Link>Cookies\NancyCookie.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cookies\INancyCookie.cs">
-      <Link>Cookies\INancyCookie.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultNancyBootstrapper.cs">
-      <Link>DefaultNancyBootstrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\ContextExtensions.cs">
-      <Link>Extensions\ContextExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\ModuleExtensions.cs">
-      <Link>Extensions\ModuleExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\RequestExtensions.cs">
-      <Link>Extensions\RequestExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\StringExtensions.cs">
-      <Link>Extensions\StringExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NamedPipelineBase.cs">
-      <Link>NamedPipelineBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\PipelineItem.cs">
-      <Link>PipelineItem.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\RequestHeaders.cs">
-      <Link>RequestHeaders.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\HtmlResponse.cs">
-      <Link>Responses\HtmlResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\Csrf.cs">
-      <Link>Security\Csrf.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\CsrfApplicationStartup.cs">
-      <Link>Security\CsrfApplicationStartup.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\CsrfToken.cs">
-      <Link>Security\CsrfToken.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\CsrfTokenExtensions.cs">
-      <Link>Security\CsrfTokenExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\CsrfValidationException.cs">
-      <Link>Security\CsrfValidationException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\DefaultCsrfTokenValidator.cs">
-      <Link>Security\DefaultCsrfTokenValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\ICsrfTokenValidator.cs">
-      <Link>Security\ICsrfTokenValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\CsrfTokenValidationResult.cs">
-      <Link>Security\CsrfTokenValidationResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ResponseExtensions.cs">
-      <Link>ResponseExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\StaticConfiguration.cs">
-      <Link>StaticConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\TraceConfiguration.cs">
-      <Link>TraceConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\TraceConfigurationExtensions.cs">
-      <Link>TraceConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Url.cs">
-      <Link>Url.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\CompositeValidator.cs">
-      <Link>Validation\CompositeValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\DefaultValidatorLocator.cs">
-      <Link>Validation\DefaultValidatorLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\IModelValidator.cs">
-      <Link>Validation\IModelValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\IModelValidatorFactory.cs">
-      <Link>Validation\IModelValidatorFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\IModelValidatorLocator.cs">
-      <Link>Validation\IModelValidatorLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\ModelValidationException.cs">
-      <Link>Validation\ModelValidationException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\ModuleExtensions.cs">
-      <Link>Validation\ModuleExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\Rules\ComparisonOperator.cs">
-      <Link>Validation\Rules\ComparisonOperator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\Rules\NotEmptyValidationRule.cs">
-      <Link>Validation\Rules\NotEmptyValidationRule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\Rules\NotNullValidationRule.cs">
-      <Link>Validation\Rules\NotNullValidationRule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\Rules\ComparisonValidationRule.cs">
-      <Link>Validation\Rules\ComparisonValidationRule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\Rules\RegexValidationRule.cs">
-      <Link>Validation\Rules\RegexValidationRule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\Rules\StringLengthValidationRule.cs">
-      <Link>Validation\Rules\StringLengthValidationRule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\ModelValidationDescriptor.cs">
-      <Link>Validation\ModelValidationDescriptor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\ModelValidationError.cs">
-      <Link>Validation\ModelValidationError.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\ModelValidationResult.cs">
-      <Link>Validation\ModelValidationResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Validation\ModelValidationRule.cs">
-      <Link>Validation\ModelValidationRule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewConfiguration.cs">
-      <Link>ViewConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewConfigurationExtensions.cs">
-      <Link>ViewConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultFileSystemReader.cs">
-      <Link>ViewEngines\DefaultFileSystemReader.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultRenderContext.cs">
-      <Link>ViewEngines\DefaultRenderContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultRenderContextFactory.cs">
-      <Link>ViewEngines\DefaultRenderContextFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ResourceAssemblyProvider.cs">
-      <Link>ResourceAssemblyProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultResourceReader.cs">
-      <Link>ViewEngines\DefaultResourceReader.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Localization\ResourceBasedTextResource.cs">
-      <Link>Localization\ResourceBasedTextResource.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultViewCache.cs">
-      <Link>ViewEngines\DefaultViewCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\Extensions.cs">
-      <Link>ViewEngines\Extensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\FileSystemViewLocationProvider.cs">
-      <Link>ViewEngines\FileSystemViewLocationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\FormatterExtensions.cs">
-      <Link>FormatterExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HeadResponse.cs">
-      <Link>HeadResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\CollectionExtensions.cs">
-      <Link>Extensions\CollectionExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Bootstrapper\NancyBootstrapperWithRequestContainerBase.cs">
-      <Link>Bootstrapper\NancyBootstrapperWithRequestContainerBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\HttpEncoder.cs">
-      <Link>Helpers\HttpEncoder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\HttpUtility.cs">
-      <Link>Helpers\HttpUtility.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpFile.cs">
-      <Link>HttpFile.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpMultipart.cs">
-      <Link>HttpMultipart.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpMultipartBoundary.cs">
-      <Link>HttpMultipartBoundary.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpMultipartBuffer.cs">
-      <Link>HttpMultipartBuffer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpStatusCode.cs">
-      <Link>HttpStatusCode.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IHideObjectMembers.cs">
-      <Link>IHideObjectMembers.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\INancyContextFactory.cs">
-      <Link>INancyContextFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\INancyModuleCatalog.cs">
-      <Link>INancyModuleCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IResponseFormatter.cs">
-      <Link>IResponseFormatter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\JavaScriptConverter.cs">
-      <Link>Json\JavaScriptConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\JavaScriptSerializer.cs">
-      <Link>Json\JavaScriptSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\Json.cs">
-      <Link>Json\Json.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Helpers\ReflectionUtils.cs">
-      <Link>Helpers\ReflectionUtils.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\ScriptIgnoreAttribute.cs">
-      <Link>Json\ScriptIgnoreAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\StringBuilderExtensions.cs">
-      <Link>Json\StringBuilderExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\MimeTypes.cs">
-      <Link>MimeTypes.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\BindingContext.cs">
-      <Link>ModelBinding\BindingContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\BindingDefaults.cs">
-      <Link>ModelBinding\BindingDefaults.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultBinder.cs">
-      <Link>ModelBinding\DefaultBinder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultBodyDeserializers\JsonBodyDeserializer.cs">
-      <Link>ModelBinding\DefaultBodyDeserializers\JsonBodyDeserializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultBodyDeserializers\XmlBodyDeserializer.cs">
-      <Link>ModelBinding\DefaultBodyDeserializers\XmlBodyDeserializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultConverters\CollectionConverter.cs">
-      <Link>ModelBinding\DefaultConverters\CollectionConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultConverters\FallbackConverter.cs">
-      <Link>ModelBinding\DefaultConverters\FallbackConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultFieldNameConverter.cs">
-      <Link>ModelBinding\DefaultFieldNameConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DynamicModelBinderAdapter.cs">
-      <Link>ModelBinding\DynamicModelBinderAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\IBodyDeserializer.cs">
-      <Link>ModelBinding\IBodyDeserializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\IBinder.cs">
-      <Link>ModelBinding\IBinder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\IFieldNameConverter.cs">
-      <Link>ModelBinding\IFieldNameConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\IModelBinder.cs">
-      <Link>ModelBinding\IModelBinder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\IModelBinderLocator.cs">
-      <Link>ModelBinding\IModelBinderLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\ITypeConverter.cs">
-      <Link>ModelBinding\ITypeConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\DefaultModelBinderLocator.cs">
-      <Link>ModelBinding\DefaultModelBinderLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\ModelBindingException.cs">
-      <Link>ModelBinding\ModelBindingException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ModelBinding\ModuleExtensions.cs">
-      <Link>ModelBinding\ModuleExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NancyContext.cs">
-      <Link>NancyContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\AfterPipeline.cs">
-      <Link>AfterPipeline.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\BeforePipeline.cs">
-      <Link>BeforePipeline.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultResponseFormatter.cs">
-      <Link>DefaultResponseFormatter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IO\RequestStream.cs">
-      <Link>IO\RequestStream.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\GenericFileResponse.cs">
-      <Link>Responses\GenericFileResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\JsonResponse.cs">
-      <Link>Responses\JsonResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\RedirectResponse.cs">
-      <Link>Responses\RedirectResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Responses\XmlResponse.cs">
-      <Link>Responses\XmlResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultNancyModuleBuilder.cs">
-      <Link>Routing\DefaultNancyModuleBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultRouteCacheProvider.cs">
-      <Link>Routing\DefaultRouteCacheProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IRootPathProvider.cs">
-      <Link>IRootPathProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\INancyModuleBuilder.cs">
-      <Link>Routing\INancyModuleBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteCache.cs">
-      <Link>Routing\IRouteCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteCacheProvider.cs">
-      <Link>Routing\IRouteCacheProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\RouteCache.cs">
-      <Link>Routing\RouteCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\MethodNotAllowedRoute.cs">
-      <Link>Routing\MethodNotAllowedRoute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\RouteDescription.cs">
-      <Link>Routing\RouteDescription.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\ModuleSecurity.cs">
-      <Link>Security\ModuleSecurity.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\SecurityHooks.cs">
-      <Link>Security\SecurityHooks.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Security\ClaimsPrincipalExtensions.cs">
-      <Link>Security\ClaimsPrincipalExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Session\CookieBasedSessions.cs">
-      <Link>Session\CookieBasedSessions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultObjectSerializer.cs">
-      <Link>DefaultObjectSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Cryptography\IEncryptionProvider.cs">
-      <Link>Cryptography\IEncryptionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IObjectSerializerSelector.cs">
-      <Link>IObjectSerializerSelector.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Session\ISession.cs">
-      <Link>Session\ISession.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IObjectSerializer.cs">
-      <Link>IObjectSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Session\NullSessionProvider.cs">
-      <Link>Session\NullSessionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Session\Session.cs">
-      <Link>Session\Session.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\HttpMultipartSubStream.cs">
-      <Link>HttpMultipartSubStream.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\TinyIoc\TinyIoC.cs">
-      <Link>TinyIoc\TinyIoC.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NancyModule.cs">
-      <Link>NancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\INancyEngine.cs">
-      <Link>INancyEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Request.cs">
-      <Link>Request.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NancyEngine.cs">
-      <Link>NancyEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Response.cs">
-      <Link>Response.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\NotFoundResponse.cs">
-      <Link>NotFoundResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\IRouteResolver.cs">
-      <Link>Routing\IRouteResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\NotFoundRoute.cs">
-      <Link>Routing\NotFoundRoute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DynamicDictionary.cs">
-      <Link>DynamicDictionary.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\DefaultRouteResolver.cs">
-      <Link>Routing\DefaultRouteResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\AmbiguousViewsException.cs">
-      <Link>ViewEngines\AmbiguousViewsException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultViewFactory.cs">
-      <Link>ViewEngines\DefaultViewFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultViewLocator.cs">
-      <Link>ViewEngines\DefaultViewLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\DefaultViewResolver.cs">
-      <Link>ViewEngines\DefaultViewResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\FileSystemViewLocationResult.cs">
-      <Link>ViewEngines\FileSystemViewLocationResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IFileSystemReader.cs">
-      <Link>ViewEngines\IFileSystemReader.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IRenderContext.cs">
-      <Link>ViewEngines\IRenderContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IRenderContextFactory.cs">
-      <Link>ViewEngines\IRenderContextFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\IResourceAssemblyProvider.cs">
-      <Link>IResourceAssemblyProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IResourceReader.cs">
-      <Link>ViewEngines\IResourceReader.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Localization\ITextResource.cs">
-      <Link>Localization\ITextResource.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IViewCache.cs">
-      <Link>ViewEngines\IViewCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IViewEngine.cs">
-      <Link>ViewEngines\IViewEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IViewLocationProvider.cs">
-      <Link>ViewEngines\IViewLocationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IViewLocator.cs">
-      <Link>ViewEngines\IViewLocator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IViewFactory.cs">
-      <Link>ViewEngines\IViewFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\IViewResolver.cs">
-      <Link>ViewEngines\IViewResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ResourceViewLocationProvider.cs">
-      <Link>ViewEngines\ResourceViewLocationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\SuperSimpleViewEngine\ISuperSimpleViewEngineMatcher.cs">
-      <Link>ViewEngines\SuperSimpleViewEngine\ISuperSimpleViewEngineMatcher.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\SuperSimpleViewEngine\IViewEngineHost.cs">
-      <Link>ViewEngines\SuperSimpleViewEngine\IViewEngineHost.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\SuperSimpleViewEngine\NancyViewEngineHost.cs">
-      <Link>ViewEngines\SuperSimpleViewEngine\NancyViewEngineHost.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\SuperSimpleViewEngine\SuperSimpleViewEngine.cs">
-      <Link>ViewEngines\SuperSimpleViewEngine\SuperSimpleViewEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\SuperSimpleViewEngine\SuperSimpleViewEngineRegistrations.cs">
-      <Link>ViewEngines\SuperSimpleViewEngine\SuperSimpleViewEngineRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\SuperSimpleViewEngine\SuperSimpleViewEngineWrapper.cs">
-      <Link>ViewEngines\SuperSimpleViewEngine\SuperSimpleViewEngineWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ViewEngineApplicationStartup.cs">
-      <Link>ViewEngines\ViewEngineApplicationStartup.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ViewEngineStartupContext.cs">
-      <Link>ViewEngines\ViewEngineStartupContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ViewLocationContext.cs">
-      <Link>ViewEngines\ViewLocationContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ViewLocationResult.cs">
-      <Link>ViewEngines\ViewLocationResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ViewNotFoundException.cs">
-      <Link>ViewEngines\ViewNotFoundException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewEngines\ViewRenderException.cs">
-      <Link>ViewEngines\ViewRenderException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\ViewRenderer.cs">
-      <Link>ViewRenderer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Xml\XmlConfigurationExtensions.cs">
-      <Link>Xml\XmlConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Xml\XmlConfiguration.cs">
-      <Link>Xml\XmlConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Xml\DefaultXmlConfigurationProvider.cs">
-      <Link>Xml\DefaultXmlConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\DefaultStaticContentConfigurationProvider.cs">
-      <Link>DefaultStaticContentConfigurationProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\StaticContentConfiguration.cs">
-      <Link>StaticContentConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\StaticContentConfigurationExtensions.cs">
-      <Link>StaticContentConfigurationExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\GlobalizationConfiguration.cs" />
-    <Compile Include="..\Nancy\GlobalizationConfigurationExtensions.cs" />
-    <Compile Include="..\Nancy\DefaultGlobalizationConfigurationProvider.cs" />
-    <Compile Include="..\Nancy\Cryptography\AesEncryptionProvider.cs">
-      <Link>Cryptography\AesEncryptionProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Json\SimpleJson.cs">
-      <Link>Json\SimpleJson.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Extensions\ObjectExtensions.cs">
-      <Link>Extensions\ObjectExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Configuration\ConfigurationException.cs">
-      <Link>Configuration\ConfigurationException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy\Routing\Route.cs">
-      <Link>Routing\Route.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\Dashboard.sshtml">
-      <Link>Diagnostics\Views\Dashboard.sshtml</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\favicon.ico">
-      <Link>favicon.ico</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\ErrorHandling\Resources\404.html">
-      <Link>ErrorHandling\Resources\404.html</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\ErrorHandling\Resources\500.html">
-      <Link>ErrorHandling\Resources\500.html</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\diagnostics.js">
-      <Link>Diagnostics\Resources\diagnostics.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\backbone-min.js">
-      <Link>Diagnostics\Resources\backbone-min.js</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\jquery-1.7.1.min.js">
-      <Link>Diagnostics\Resources\jquery-1.7.1.min.js</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\underscore-min.js">
-      <Link>Diagnostics\Resources\underscore-min.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\handlebars.js">
-      <Link>Diagnostics\Resources\handlebars.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\_DiagnosticsMaster.sshtml">
-      <Link>Diagnostics\Views\_DiagnosticsMaster.sshtml</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\nancy-common.js">
-      <Link>Diagnostics\Resources\nancy-common.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\interactive-diagnostics.js">
-      <Link>Diagnostics\Resources\interactive-diagnostics.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\jsonreport.js">
-      <Link>Diagnostics\Resources\jsonreport.js</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\Modules\interactive\providers.js">
-      <Link>Diagnostics\Resources\Modules\interactive\providers.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\InteractiveDiagnostics.sshtml">
-      <Link>Diagnostics\Views\InteractiveDiagnostics.sshtml</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\Modules\interactive\methods.js">
-      <Link>Diagnostics\Resources\Modules\interactive\methods.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\Modules\interactive\results.js">
-      <Link>Diagnostics\Resources\Modules\interactive\results.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\main.css">
-      <Link>Diagnostics\Resources\main.css</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\interactive.css">
-      <Link>Diagnostics\Resources\interactive.css</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\logo.png">
-      <Link>Diagnostics\Resources\logo.png</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\960.css">
-      <Link>Diagnostics\Resources\960.css</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\reset.css">
-      <Link>Diagnostics\Resources\reset.css</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\text.css">
-      <Link>Diagnostics\Resources\text.css</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\info.png">
-      <Link>Diagnostics\Resources\info.png</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\interactive.png">
-      <Link>Diagnostics\Resources\interactive.png</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\logs.png">
-      <Link>Diagnostics\Resources\logs.png</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\settings.png">
-      <Link>Diagnostics\Resources\settings.png</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\RequestTracing.sshtml">
-      <Link>Diagnostics\Views\RequestTracing.sshtml</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\Info.sshtml">
-      <Link>Diagnostics\Views\Info.sshtml</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\Settings.sshtml">
-      <Link>Diagnostics\Views\Settings.sshtml</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\request-tracing.js">
-      <Link>Diagnostics\Resources\request-tracing.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\Modules\tracing\sessions.js">
-      <Link>Diagnostics\Resources\Modules\tracing\sessions.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Resources\Modules\tracing\traces.js">
-      <Link>Diagnostics\Resources\Modules\tracing\traces.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\help.sshtml">
-      <Link>Diagnostics\Views\help.sshtml</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy\Diagnostics\Views\login.sshtml">
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/src/Nancy.MSBuild/packages.config b/src/Nancy.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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
deleted file mode 100644
index 87cae61846..0000000000
--- a/src/Nancy.Metadata.Modules.MSBuild/Nancy.Metadata.Modules.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Metadata.Modules</RootNamespace>
-    <AssemblyName>Nancy.Metadata.Modules</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <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>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Nancy.Metadata.Modules.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoDebug\Nancy.Metadata.Modules.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoRelease\Nancy.Metadata.Modules.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\DefaultMetadataModuleResolver.cs">
-      <Link>DefaultMetadataModuleResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\IMetadataModule.cs">
-      <Link>IMetadataModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\IMetadataModuleResolver.cs">
-      <Link>IMetadataModuleResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\DefaultMetadataModuleConventions.cs">
-      <Link>DefaultMetadataModuleConventions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\MetadataModule.cs">
-      <Link>MetadataModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\MetadataModuleRegistrations.cs">
-      <Link>MetadataModuleRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules\MetadataModuleRouteMetadataProvider.cs">
-      <Link>MetadataModuleRouteMetadataProvider.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Metadata.Modules.MSBuild/packages.config b/src/Nancy.Metadata.Modules.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Metadata.Modules.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Metadata.Modules.csproj b/src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.csproj
new file mode 100644
index 0000000000..f4f2494a07
--- /dev/null
+++ b/src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Nancy metadata modules to describe your APIs.</Description>
+    <PackageTags>$(PackageTags);Metadata</PackageTags>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.xproj b/src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.xproj
deleted file mode 100644
index f9774445e1..0000000000
--- a/src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>ad0737d9-12d7-449f-9b2d-a3045731c946</ProjectGuid>
-    <RootNamespace>Nancy.Metadata.Modules</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Metadata.Modules</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Metadata.Modules/project.json b/src/Nancy.Metadata.Modules/project.json
deleted file mode 100644
index 60aaccfab4..0000000000
--- a/src/Nancy.Metadata.Modules/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Nancy metadata modules to describe your APIs.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Metadata"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "imports": [
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj b/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj
deleted file mode 100644
index 673cfffda5..0000000000
--- a/src/Nancy.Owin.MSBuild/Nancy.Owin.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D6B2480C-2A52-4D02-9477-D387D7A486E5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Owin</RootNamespace>
-    <AssemblyName>Nancy.Owin</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <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>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Nancy.Owin.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoDebug\Nancy.Owin.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoRelease\Nancy.Owin.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Owin\AppBuilderExtensions.cs">
-      <Link>AppBuilderExtensions.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Owin.MSBuild/packages.config b/src/Nancy.Owin.MSBuild/packages.config
deleted file mode 100644
index b44272a8ce..0000000000
--- a/src/Nancy.Owin.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/Nancy.Owin.csproj b/src/Nancy.Owin/Nancy.Owin.csproj
new file mode 100644
index 0000000000..224e206f82
--- /dev/null
+++ b/src/Nancy.Owin/Nancy.Owin.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Nancy extensions for OWIN hosting.</Description>
+    <PackageTags>$(PackageTags);OWIN</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OWIN" Version="1.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Owin/Nancy.Owin.xproj b/src/Nancy.Owin/Nancy.Owin.xproj
deleted file mode 100644
index 53d4fc9099..0000000000
--- a/src/Nancy.Owin/Nancy.Owin.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>baa9cbdf-f6b7-4c85-8a22-6a316a4acc46</ProjectGuid>
-    <RootNamespace>Nancy.Owin</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Owin</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Owin/project.json b/src/Nancy.Owin/project.json
deleted file mode 100644
index 7af6a39bac..0000000000
--- a/src/Nancy.Owin/project.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Nancy extensions for OWIN hosting.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "OWIN"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        },
-        "OWIN": "1.0.0"
-    },
-    "frameworks": {
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj b/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj
deleted file mode 100644
index c227c97475..0000000000
--- a/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Testing</RootNamespace>
-    <AssemblyName>Nancy.Testing</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Testing.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Testing.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Testing.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.Testing.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Testing.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.Testing.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\Accept.cs">
-      <Link>Accept.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\AndConnector.cs">
-      <Link>AndConnector.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\AssertEqualityComparer.cs">
-      <Link>AssertEqualityComparer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\AssertException.cs">
-      <Link>AssertException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\Asserts.cs">
-      <Link>Asserts.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\Browser.cs">
-      <Link>Browser.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserContext.cs">
-      <Link>BrowserContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserContextExtensions.cs">
-      <Link>BrowserContextExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserContextMultipartFormData.cs">
-      <Link>BrowserContextMultipartFormData.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserResponse.cs">
-      <Link>BrowserResponse.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserResponseBodyWrapper.cs">
-      <Link>BrowserResponseBodyWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserResponseBodyWrapperExtensions.cs">
-      <Link>BrowserResponseBodyWrapperExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\BrowserResponseExtensions.cs">
-      <Link>BrowserResponseExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\StaticConfigurationContext.cs">
-      <Link>StaticConfigurationContext.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\TestingViewBrowserResponseExtensions.cs">
-      <Link>TestingViewBrowserResponseExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\TestingViewContextKeys.cs">
-      <Link>TestingViewContextKeys.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\TestingViewFactory.cs">
-      <Link>TestingViewFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\ConfigurableBootstrapper.cs">
-      <Link>ConfigurableBootstrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\DocumentWrapper.cs">
-      <Link>DocumentWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\NancyContextExtensions.cs">
-      <Link>NancyContextExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\ConfigurableNancyModule.cs">
-      <Link>ConfigurableNancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\IBrowserContextValues.cs">
-      <Link>IBrowserContextValues.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\IndexHelper.cs">
-      <Link>IndexHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\NodeWrapper.cs">
-      <Link>NodeWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\PassThroughStatusHandler.cs">
-      <Link>PassThroughStatusHandler.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\PathHelper.cs">
-      <Link>PathHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\QueryWrapper.cs">
-      <Link>QueryWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing\AssertExtensions.cs">
-      <Link>AssertExtensions.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.Authentication.Forms.MSBuild\Nancy.Authentication.Forms.csproj">
-      <Project>{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}</Project>
-      <Name>Nancy.Authentication.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.Testing\Resources\NancyTestingCert.pfx">
-      <Link>Resources\NancyTestingCert.pfx</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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Testing.MSBuild/packages.config b/src/Nancy.Testing.MSBuild/packages.config
deleted file mode 100644
index c0255fd39e..0000000000
--- a/src/Nancy.Testing.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/Nancy.Testing.csproj b/src/Nancy.Testing/Nancy.Testing.csproj
new file mode 100644
index 0000000000..06e1dbd7ff
--- /dev/null
+++ b/src/Nancy.Testing/Nancy.Testing.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Test harness for Nancy applications.</Description>
+    <PackageTags>$(PackageTags);Testing</PackageTags>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\NancyTestingCert.pfx" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Nancy.Authentication.Forms/Nancy.Authentication.Forms.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="0.9.8.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.IO" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Testing/Nancy.Testing.xproj b/src/Nancy.Testing/Nancy.Testing.xproj
deleted file mode 100644
index 75edddcd27..0000000000
--- a/src/Nancy.Testing/Nancy.Testing.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>e948f38f-4f8b-41fe-8f49-4792f4ec2531</ProjectGuid>
-    <RootNamespace>Nancy.Testing</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Testing</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Testing/project.json b/src/Nancy.Testing/project.json
deleted file mode 100644
index c38bbfc966..0000000000
--- a/src/Nancy.Testing/project.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Test harness for Nancy applications.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Testing"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "dependencies": {
-        "AngleSharp": "0.9.8.1",
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        },
-        "Nancy.Authentication.Forms": {
-            "target": "project"
-        }
-    },
-    "buildOptions": {
-        "xmlDoc": true,
-        "embed": [
-            "Resources/NancyTestingCert.pfx"
-        ]
-    },
-    "frameworks": {
-        "netstandard1.6": {
-            "dependencies": {
-                "System.Xml.XmlDocument": "4.0.1",
-                "System.Xml.XDocument": "4.0.11"
-            },
-            "imports": [
-                "dotnet54",
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {
-            "frameworkAssemblies": {
-                "System.IO": {
-                    "type": "build"
-                },
-                "System.Runtime": {
-                    "type": "build"
-                },
-                "System.Xml.Linq": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj b/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj
deleted file mode 100644
index 597605ebd3..0000000000
--- a/src/Nancy.Validation.DataAnnotations.MSBuild/Nancy.Validation.DataAnnotations.csproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{701765DC-F4F2-4943-A37F-6ED253198158}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Validation.DataAnnotations</RootNamespace>
-    <AssemblyName>Nancy.Validation.DataAnnotations</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Validation.DataAnnotations.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Validation.DataAnnotations.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Validation.DataAnnotations.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <DocumentationFile>bin\MonoDebug\Nancy.Validation.DataAnnotations.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Validation.DataAnnotations.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <DocumentationFile>bin\MonoRelease\Nancy.Validation.DataAnnotations.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\DefaultPropertyValidatorFactory.cs">
-      <Link>DefaultPropertyValidatorFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\IPropertyValidator.cs">
-      <Link>IPropertyValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\IPropertyValidatorFactory.cs">
-      <Link>IPropertyValidatorFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\IValidatableObjectAdapter.cs">
-      <Link>IValidatableObjectAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\PropertyValidator.cs">
-      <Link>PropertyValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\DataAnnotationsRegistrations.cs">
-      <Link>DataAnnotationsRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\DefaultValidatableObjectAdapter.cs">
-      <Link>DefaultValidatableObjectAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\DataAnnotationsValidator.cs">
-      <Link>DataAnnotationsValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\DataAnnotationsValidatorAdapter.cs">
-      <Link>DataAnnotationsValidatorAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\DataAnnotationsValidatorFactory.cs">
-      <Link>DataAnnotationsValidatorFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\IDataAnnotationsValidatorAdapter.cs">
-      <Link>IDataAnnotationsValidatorAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\RangeValidatorAdapter.cs">
-      <Link>RangeValidatorAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\RegexValidatorAdapter.cs">
-      <Link>RegexValidatorAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\RequiredValidatorAdapter.cs">
-      <Link>RequiredValidatorAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotations\StringLengthValidatorAdapter.cs">
-      <Link>StringLengthValidatorAdapter.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Validation.DataAnnotations.MSBuild/packages.config b/src/Nancy.Validation.DataAnnotations.MSBuild/packages.config
deleted file mode 100644
index a52600a908..0000000000
--- a/src/Nancy.Validation.DataAnnotations.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/Nancy.Validation.DataAnnotations.csproj b/src/Nancy.Validation.DataAnnotations/Nancy.Validation.DataAnnotations.csproj
new file mode 100644
index 0000000000..16a701a4b5
--- /dev/null
+++ b/src/Nancy.Validation.DataAnnotations/Nancy.Validation.DataAnnotations.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Adds Data Annotation validation support to Nancy.</Description>
+    <PackageTags>$(PackageTags);Validation;DataAnnotations</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Validation.DataAnnotations/Nancy.Validation.DataAnnotations.xproj b/src/Nancy.Validation.DataAnnotations/Nancy.Validation.DataAnnotations.xproj
deleted file mode 100644
index 9f7d18ea10..0000000000
--- a/src/Nancy.Validation.DataAnnotations/Nancy.Validation.DataAnnotations.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>21fb2d6b-2525-4a24-bf66-d34941c7fa88</ProjectGuid>
-    <RootNamespace>Nancy.Validation.DataAnnotations</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Validation.DataAnnotations</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Validation.DataAnnotations/project.json b/src/Nancy.Validation.DataAnnotations/project.json
deleted file mode 100644
index 16e26f48fa..0000000000
--- a/src/Nancy.Validation.DataAnnotations/project.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Adds Data Annotation validation support to Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Validation",
-            "DataAnnotations"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        }
-    },
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.ComponentModel.DataAnnotations": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj b/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj
deleted file mode 100644
index b434146f9f..0000000000
--- a/src/Nancy.Validation.FluentValidation.MSBuild/Nancy.Validation.FluentValidation.csproj
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{01230F2A-D108-480C-B834-8CE0569FD3B3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Validation.FluentValidation</RootNamespace>
-    <AssemblyName>Nancy.Validation.FluentValidation</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.Validation.FluentValidation.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.Validation.FluentValidation.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Validation.FluentValidation.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <DocumentationFile>bin\MonoDebug\Nancy.Validation.FluentValidation.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Validation.FluentValidation.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <DocumentationFile>bin\MonoRelease\Nancy.Validation.FluentValidation.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentValidation, Version=6.3.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.6.3.4-alpha\lib\Net45\FluentValidation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\AdapterBase.cs">
-      <Link>AdapterBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\FallbackAdapter.cs">
-      <Link>FallbackAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\FluentValidationRegistrations.cs">
-      <Link>FluentValidationRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\DefaultFluentAdapterFactory.cs">
-      <Link>DefaultFluentAdapterFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\EmailAdapter.cs">
-      <Link>EmailAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\EqualAdapter.cs">
-      <Link>EqualAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\ExactLengthAdapater.cs">
-      <Link>ExactLengthAdapater.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\ExclusiveBetweenAdapter.cs">
-      <Link>ExclusiveBetweenAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\FluentValidationValidator.cs">
-      <Link>FluentValidationValidator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\FluentValidationValidatorFactory.cs">
-      <Link>FluentValidationValidatorFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\GreaterThanAdapter.cs">
-      <Link>GreaterThanAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\GreaterThanOrEqualAdapter.cs">
-      <Link>GreaterThanOrEqualAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\IFluentAdapter.cs">
-      <Link>IFluentAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\IFluentAdapterFactory.cs">
-      <Link>IFluentAdapterFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\InclusiveBetweenAdapter.cs">
-      <Link>InclusiveBetweenAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\LengthAdapter.cs">
-      <Link>LengthAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\LessThanAdapter.cs">
-      <Link>LessThanAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\LessThanOrEqualAdapter.cs">
-      <Link>LessThanOrEqualAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\NotEmptyAdapter.cs">
-      <Link>NotEmptyAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\NotEqualAdapter.cs">
-      <Link>NotEqualAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\NotNullAdapter.cs">
-      <Link>NotNullAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation\RegularExpressionAdapter.cs">
-      <Link>RegularExpressionAdapter.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.Validation.FluentValidation.MSBuild/packages.config b/src/Nancy.Validation.FluentValidation.MSBuild/packages.config
deleted file mode 100644
index f2f8f6106f..0000000000
--- a/src/Nancy.Validation.FluentValidation.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/Nancy.Validation.FluentValidation.csproj b/src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.csproj
new file mode 100644
index 0000000000..41c532c65e
--- /dev/null
+++ b/src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Adds Fluent Validation support to Nancy.</Description>
+    <PackageTags>$(PackageTags);Validation;FluentValidation</PackageTags>
+    <TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentValidation" Version="6.3.4-alpha" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.xproj b/src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.xproj
deleted file mode 100644
index c4f0d5d0b2..0000000000
--- a/src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>35b9dd79-d65a-423c-9dc0-59dcf3bf2e98</ProjectGuid>
-    <RootNamespace>Nancy.Validation.FluentValidation</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Validation.FluentValidation</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.Validation.FluentValidation/project.json b/src/Nancy.Validation.FluentValidation/project.json
deleted file mode 100644
index 115daac2ad..0000000000
--- a/src/Nancy.Validation.FluentValidation/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Adds Fluent Validation support to Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "Validation",
-            "FluentValidation"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "Nancy": {
-            "target": "project"
-        },
-        "FluentValidation": "6.3.4-alpha",
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        }
-    },
-    "frameworks": {
-        "net452": {},
-        "netstandard1.6": {
-            "imports": "dnxcore50"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj b/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj
deleted file mode 100644
index c0a86bc1a0..0000000000
--- a/src/Nancy.ViewEngines.DotLiquid.MSBuild/Nancy.ViewEngines.DotLiquid.csproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B795886D-9D70-45B1-BFB5-AD54CBC9A447}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.DotLiquid</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.DotLiquid</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.ViewEngines.DotLiquid.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.ViewEngines.DotLiquid.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.DotLiquid.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.ViewEngines.DotLiquid.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.DotLiquid.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.ViewEngines.DotLiquid.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotLiquid, Version=2.0.64.0, Culture=neutral, PublicKeyToken=82e46016ecf9f07c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DotLiquid.2.0.64\lib\net451\DotLiquid.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid\DefaultFileSystemFactory.cs">
-      <Link>DefaultFileSystemFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid\DotLiquidRegistrations.cs">
-      <Link>DotLiquidRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid\DotLiquidViewEngine.cs">
-      <Link>DotLiquidViewEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid\DynamicDrop.cs">
-      <Link>DynamicDrop.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid\IFileSystemFactory.cs">
-      <Link>IFileSystemFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid\LiquidNancyFileSystem.cs">
-      <Link>LiquidNancyFileSystem.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.ViewEngines.DotLiquid\Resources\500.liquid">
-      <Link>Resources\500.liquid</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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config b/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config
deleted file mode 100644
index 79bb59bab4..0000000000
--- a/src/Nancy.ViewEngines.DotLiquid.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
-  <package id="DotLiquid" version="2.0.64" targetFramework="net452" />
-</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.csproj b/src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.csproj
new file mode 100644
index 0000000000..11ab975032
--- /dev/null
+++ b/src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables using the DotLiquid view engine with Nancy.</Description>
+    <PackageTags>$(PackageTags);View Engine;DotLiquid</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DotLiquid" Version="2.0.64" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.xproj b/src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.xproj
deleted file mode 100644
index 5d57aac1a2..0000000000
--- a/src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>98febb4d-cff9-4318-b2f0-c5dcc5436a47</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.DotLiquid</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.DotLiquid</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.ViewEngines.DotLiquid/project.json b/src/Nancy.ViewEngines.DotLiquid/project.json
deleted file mode 100644
index e0274b9f4f..0000000000
--- a/src/Nancy.ViewEngines.DotLiquid/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables using the DotLiquid view engine with Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "View Engine",
-            "DotLiquid"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "Nancy": {
-            "target": "project"
-        },
-        "DotLiquid": "2.0.64",
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        }
-    },
-    "frameworks": {
-        "net452": {}
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj b/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj
deleted file mode 100644
index 7fea914b7b..0000000000
--- a/src/Nancy.ViewEngines.Markdown.MSBuild/Nancy.ViewEngines.Markdown.csproj
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Nancy.ViewEngines.Markdown</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Markdown</AssemblyName>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <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>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <DebugSymbols>true</DebugSymbols>
-    <DocumentationFile>bin\Release\Nancy.ViewEngines.Markdown.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDevelop|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDevelop\</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\MonoDevelop\Nancy.ViewEngines.Markdown.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <DocumentationFile>bin\MonoRelease\Nancy.ViewEngines.Markdown.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Markdown">
-      <HintPath>..\..\packages\Markdown.2.2.0\lib\net451\Markdown.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Markdown\MarkDownViewEngine.cs">
-      <Link>MarkDownViewEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Markdown\MarkdownViewEngineHost.cs">
-      <Link>MarkdownViewEngineHost.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Markdown\MarkdownViewengineRender.cs">
-      <Link>MarkdownViewengineRender.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <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>
-</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
deleted file mode 100644
index 2d902f35f5..0000000000
--- a/src/Nancy.ViewEngines.Markdown.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
-  <package id="Markdown" version="2.2.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.csproj b/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.csproj
new file mode 100644
index 0000000000..27bc2ecce0
--- /dev/null
+++ b/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables using Markdown with Nancy.</Description>
+    <PackageTags>$(PackageTags);View Engine;Markdown</PackageTags>
+    <TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Markdown" Version="2.2.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.xproj b/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.xproj
deleted file mode 100644
index ca15bbe5b5..0000000000
--- a/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>cfa5bbcb-b41b-47c0-a4d2-fa243fc6ecc6</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Markdown</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Markdown</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.ViewEngines.Markdown/project.json b/src/Nancy.ViewEngines.Markdown/project.json
deleted file mode 100644
index 779af37a33..0000000000
--- a/src/Nancy.ViewEngines.Markdown/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables using Markdown with Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "View Engine",
-            "Markdown"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-
-    "dependencies": {
-        "Nancy": {
-            "target": "project"
-        },
-        "Markdown": "2.2.0",
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        }
-    },
-
-    "frameworks": {
-        "net452": {},
-        "netstandard1.6": {}
-    }
-}
diff --git a/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj b/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj
deleted file mode 100644
index 04b5f0b50c..0000000000
--- a/src/Nancy.ViewEngines.Nustache.MSBuild/Nancy.ViewEngines.Nustache.csproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A1A9E636-A37C-4170-B2E4-99D4F69B415D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Nustache</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Nustache</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.ViewEngines.Nustache.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.ViewEngines.Nustache.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Nustache.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <DocumentationFile>bin\MonoDebug\Nancy.ViewEngines.Nustache.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Nustache.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <DocumentationFile>bin\MonoRelease\Nancy.ViewEngines.Nustache.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Nustache.Core, Version=1.13.8.22, Culture=neutral, PublicKeyToken=efd6f3d8f76ecd9f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Nustache.1.13.8.22\lib\net20\Nustache.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Nustache\NustacheViewEngine.cs">
-      <Link>NustacheViewEngine.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config b/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config
deleted file mode 100644
index efd93bb322..0000000000
--- a/src/Nancy.ViewEngines.Nustache.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Nustache/Nancy.ViewEngines.Nustache.csproj b/src/Nancy.ViewEngines.Nustache/Nancy.ViewEngines.Nustache.csproj
new file mode 100644
index 0000000000..4363dc583d
--- /dev/null
+++ b/src/Nancy.ViewEngines.Nustache/Nancy.ViewEngines.Nustache.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables using the Nustache view engine with Nancy.</Description>
+    <PackageTags>$(PackageTags);View Engine;Nustache</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nustache" Version="1.13.8.22" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.ViewEngines.Nustache/Nancy.ViewEngines.Nustache.xproj b/src/Nancy.ViewEngines.Nustache/Nancy.ViewEngines.Nustache.xproj
deleted file mode 100644
index e113ad5e48..0000000000
--- a/src/Nancy.ViewEngines.Nustache/Nancy.ViewEngines.Nustache.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>32e22782-7a5e-4546-b2db-f3628ea36361</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Nustache</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Nustache</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.ViewEngines.Nustache/project.json b/src/Nancy.ViewEngines.Nustache/project.json
deleted file mode 100644
index 20eb7aed44..0000000000
--- a/src/Nancy.ViewEngines.Nustache/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables using the Nustache view engine with Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "View Engine",
-            "Nustache"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        },
-        "Nustache": "1.13.8.22"
-    },
-    "frameworks": {
-        "net452": {}
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index c630f785b2..0000000000
--- a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/Nancy.ViewEngines.Razor.BuildProviders.csproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EDF3E264-2D0F-4440-99FF-45D279A598A9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Razor.BuildProviders</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Razor.BuildProviders</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.ViewEngines.Razor.BuildProviders.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.ViewEngines.Razor.BuildProviders.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Razor.BuildProviders.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.ViewEngines.Razor.BuildProviders.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Razor.BuildProviders.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.ViewEngines.Razor.BuildProviders.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.BuildProviders\NancyCSharpRazorBuildProvider.cs">
-      <Link>NancyCSharpRazorBuildProvider.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.ViewEngines.Razor.MSBuild\Nancy.ViewEngines.Razor.csproj">
-      <Project>{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}</Project>
-      <Name>Nancy.ViewEngines.Razor</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config b/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config
deleted file mode 100644
index c3d194ab01..0000000000
--- a/src/Nancy.ViewEngines.Razor.BuildProviders.MSBuild/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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" />
-</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.csproj b/src/Nancy.ViewEngines.Razor.BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.csproj
new file mode 100644
index 0000000000..ba93258d8a
--- /dev/null
+++ b/src/Nancy.ViewEngines.Razor.BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Web" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.xproj b/src/Nancy.ViewEngines.Razor.BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.xproj
deleted file mode 100644
index ff0b8dd0ed..0000000000
--- a/src/Nancy.ViewEngines.Razor.BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>26df3be0-146b-43a6-b230-d5b33355f415</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Razor.BuildProviders</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Razor.BuildProviders</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders/project.json b/src/Nancy.ViewEngines.Razor.BuildProviders/project.json
deleted file mode 100644
index 0a36bddcd8..0000000000
--- a/src/Nancy.ViewEngines.Razor.BuildProviders/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        },
-        "Nancy.ViewEngines.Razor": {
-            "target": "project"
-        }
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Web": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj b/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj
deleted file mode 100644
index 7e71cfb84b..0000000000
--- a/src/Nancy.ViewEngines.Razor.MSBuild/Nancy.ViewEngines.Razor.csproj
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props')" />
-  <Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Razor</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Razor</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.ViewEngines.Razor.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.ViewEngines.Razor.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>false</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>none</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Razor.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.ViewEngines.Razor.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>none</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Razor.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.ViewEngines.Razor.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.1.1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.1.1.1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Reflection.Metadata, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Reflection.Metadata.1.1.0\lib\dotnet5.2\System.Reflection.Metadata.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\AttributeValue.cs">
-      <Link>AttributeValue.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\ClrTypeResolver.cs">
-      <Link>ClrTypeResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\CodeParserHelper.cs">
-      <Link>CodeParserHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\CSharp\CSharpClrTypeResolver.cs">
-      <Link>CSharp\CSharpClrTypeResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\CSharp\CSharpRazorViewRenderer.cs">
-      <Link>CSharp\CSharpRazorViewRenderer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\DefaultRazorConfiguration.cs">
-      <Link>DefaultRazorConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\HelperResult.cs">
-      <Link>HelperResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\HtmlHelpers.cs">
-      <Link>HtmlHelpers.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\HtmlHelpersExtensions.cs">
-      <Link>HtmlHelpersExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\IHtmlString.cs">
-      <Link>IHtmlString.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\INancyRazorView.cs">
-      <Link>INancyRazorView.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\IRazorConfiguration.cs">
-      <Link>IRazorConfiguration.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\IRazorViewRenderer.cs">
-      <Link>IRazorViewRenderer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\CSharp\NancyCSharpRazorCodeParser.cs">
-      <Link>CSharp\NancyCSharpRazorCodeParser.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\ModelCodeGenerator.cs">
-      <Link>ModelCodeGenerator.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\NancyRazorEngineHost.cs">
-      <Link>NancyRazorEngineHost.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\NancyRazorErrorView.cs">
-      <Link>NancyRazorErrorView.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\NancyRazorViewBase.cs">
-      <Link>NancyRazorViewBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\NonEncodedHtmlString.cs">
-      <Link>NonEncodedHtmlString.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\RazorAssemblyProvider.cs">
-      <Link>RazorAssemblyProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\RazorConfigurationSection.cs">
-      <Link>RazorConfigurationSection.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\RazorViewEngine.cs">
-      <Link>RazorViewEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\RazorViewEngineApplicationStartupRegistrations.cs">
-      <Link>RazorViewEngineApplicationStartupRegistrations.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\UrlHelpers.cs">
-      <Link>UrlHelpers.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor\EncodedHtmlString.cs">
-      <Link>EncodedHtmlString.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.ViewEngines.Razor\Resources\CompilationError.html">
-      <Link>Resources\CompilationError.html</Link>
-    </EmbeddedResource>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
-    <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>
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Razor.MSBuild/packages.config b/src/Nancy.ViewEngines.Razor.MSBuild/packages.config
deleted file mode 100644
index 4fe35f2459..0000000000
--- a/src/Nancy.ViewEngines.Razor.MSBuild/packages.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.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" />
-  <package id="System.Globalization" version="4.0.0" targetFramework="net45" />
-  <package id="System.IO" version="4.0.0" targetFramework="net45" />
-  <package id="System.Linq" version="4.0.0" targetFramework="net45" />
-  <package id="System.Reflection" version="4.0.0" targetFramework="net45" />
-  <package id="System.Reflection.Extensions" version="4.0.0" targetFramework="net45" />
-  <package id="System.Reflection.Metadata" version="1.1.0" targetFramework="net45" />
-  <package id="System.Reflection.Primitives" version="4.0.0" targetFramework="net45" />
-  <package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net45" />
-  <package id="System.Runtime" version="4.0.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net45" />
-  <package id="System.Runtime.InteropServices" version="4.0.0" targetFramework="net45" />
-  <package id="System.Text.Encoding" version="4.0.0" targetFramework="net45" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.0" targetFramework="net45" />
-  <package id="System.Threading" version="4.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj b/src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj
new file mode 100644
index 0000000000..9f5ceaf1cd
--- /dev/null
+++ b/src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables using the Razor view engine with Nancy.</Description>
+    <PackageTags>$(PackageTags);View Engine;Razor</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+    <None Update=".\web.config.transform">
+      <PackagePath>content</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Update=".\app.config.transform">
+      <PackagePath>content</PackagePath>
+      <Pack>true</Pack>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNet.Razor" Version="2.0.30506" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="1.0.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.IO" />
+    <Reference Include="System.Reflection" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Text.Encoding" />
+    <Reference Include="System.Threading.Tasks" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.xproj b/src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.xproj
deleted file mode 100644
index c5e6b12d3b..0000000000
--- a/src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>3a376b78-dd7d-4450-9fde-f7236faa6e63</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Razor</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Razor</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.ViewEngines.Razor/project.json b/src/Nancy.ViewEngines.Razor/project.json
deleted file mode 100644
index 39fa2ce5ae..0000000000
--- a/src/Nancy.ViewEngines.Razor/project.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables using the Razor view engine with Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "View Engine",
-            "Razor"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png",
-        "files": {
-            "mappings": {
-                "content/app.config.transform": "./app.config.transform",
-                "content/web.config.transform": "./web.config.transform"
-            }
-        }
-    },
-    "dependencies": {
-        "Nancy": {
-            "target": "project"
-        },
-        "Microsoft.AspNet.Razor": "2.0.30506.0",
-        "Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-20151109-01",
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        }
-    },
-    "buildOptions": {
-        "embed": "Resources/**/*.*",
-        "xmlDoc": true
-    },
-    "frameworks": {
-        "net452": {
-            "dependencies": {
-                "Microsoft.CodeDom.Providers.DotNetCompilerPlatform": "1.0.1"
-            },
-            "frameworkAssemblies": {
-                "System.Configuration": {
-                    "type": "build"
-                },
-                "System.IO": {
-                    "type": "build"
-                },
-                "System.Reflection": {
-                    "type": "build"
-                },
-                "System.Runtime": {
-                    "type": "build"
-                },
-                "System.Text.Encoding": {
-                    "type": "build"
-                },
-                "System.Threading.Tasks": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj b/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj
deleted file mode 100644
index 7665024a8e..0000000000
--- a/src/Nancy.ViewEngines.Spark.MSBuild/Nancy.ViewEngines.Spark.csproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4B7E35DF-1569-4346-B180-A09615723095}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Spark</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Spark</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\Nancy.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Debug\Nancy.ViewEngines.Spark.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\Nancy.ViewEngines.Spark.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Spark.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <DocumentationFile>bin\MonoDebug\Nancy.ViewEngines.Spark.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Spark.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\MonoRelease\Nancy.ViewEngines.Spark.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Spark, Version=1.7.0.0, Culture=neutral, PublicKeyToken=7f8549eed921a12c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Spark.1.7.0.0\lib\NET40\Spark.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\Descriptors\DescriptorFilterExtensions.cs">
-      <Link>Descriptors\DescriptorFilterExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\Descriptors\BuildDescriptorParams.cs">
-      <Link>Descriptors\BuildDescriptorParams.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\Descriptors\IDescriptorFilter.cs">
-      <Link>Descriptors\IDescriptorFilter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\Descriptors\IDescriptorBuilder.cs">
-      <Link>Descriptors\IDescriptorBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\Descriptors\DefaultDescriptorBuilder.cs">
-      <Link>Descriptors\DefaultDescriptorBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\NancyBindingProvider.cs">
-      <Link>NancyBindingProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\NancySparkView.cs">
-      <Link>NancySparkView.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\NancyViewData.cs">
-      <Link>NancyViewData.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\NancyViewFolder.cs">
-      <Link>NancyViewFolder.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\SparkRenderContextWrapper.cs">
-      <Link>SparkRenderContextWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\SparkViewEngineResult.cs">
-      <Link>SparkViewEngineResult.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark\SparkViewEngine.cs">
-      <Link>SparkViewEngine.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Spark.MSBuild/packages.config b/src/Nancy.ViewEngines.Spark.MSBuild/packages.config
deleted file mode 100644
index ed604cc643..0000000000
--- a/src/Nancy.ViewEngines.Spark.MSBuild/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/src/Nancy.ViewEngines.Spark/Nancy.ViewEngines.Spark.csproj b/src/Nancy.ViewEngines.Spark/Nancy.ViewEngines.Spark.csproj
new file mode 100644
index 0000000000..1e6be5f852
--- /dev/null
+++ b/src/Nancy.ViewEngines.Spark/Nancy.ViewEngines.Spark.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Enables using the Spark view engine with Nancy.</Description>
+    <PackageTags>$(PackageTags);View Engine;Spark</PackageTags>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Spark" Version="1.7.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy.ViewEngines.Spark/Nancy.ViewEngines.Spark.xproj b/src/Nancy.ViewEngines.Spark/Nancy.ViewEngines.Spark.xproj
deleted file mode 100644
index c6084edaec..0000000000
--- a/src/Nancy.ViewEngines.Spark/Nancy.ViewEngines.Spark.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>25e3ab38-d95e-4d11-b0f0-0f60571a97a0</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Spark</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Spark</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy.ViewEngines.Spark/project.json b/src/Nancy.ViewEngines.Spark/project.json
deleted file mode 100644
index 635575cfad..0000000000
--- a/src/Nancy.ViewEngines.Spark/project.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "description": "Enables using the Spark view engine with Nancy.",
-    "authors": [
-        "Andreas Håkansson, Steven Robbins and contributors"
-    ],
-    "packOptions": {
-        "tags": [
-            "Nancy",
-            "View Engine",
-            "Spark"
-        ],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-    "buildOptions": {
-        "xmlDoc": true
-    },
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        },
-        "Nancy": {
-            "target": "project"
-        },
-        "Spark": "1.7.0"
-    },
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Configuration": {
-                    "type": "build"
-                },
-                "System.Web": {
-                    "type": "build"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Nancy/Nancy.csproj b/src/Nancy/Nancy.csproj
new file mode 100644
index 0000000000..618e393845
--- /dev/null
+++ b/src/Nancy/Nancy.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <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.</Description>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="ErrorHandling\Resources\**\*.*;Diagnostics\Resources\**\*.*;Diagnostics\Views\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+    <PackageReference Include="System.Security.Claims" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+</Project>
diff --git a/src/Nancy/Nancy.xproj b/src/Nancy/Nancy.xproj
deleted file mode 100644
index 25d68c1426..0000000000
--- a/src/Nancy/Nancy.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>87c7c329-1824-4ac7-af25-3d06068a01f6</ProjectGuid>
-    <RootNamespace>Nancy</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Nancy/project.json b/src/Nancy/project.json
deleted file mode 100644
index 136872761c..0000000000
--- a/src/Nancy/project.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "version": "2.0.0-clinteastwood",
-    "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"],
-
-    "packOptions": {
-        "tags": ["Nancy"],
-        "projectUrl": "http://nancyfx.org",
-        "licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
-        "iconUrl": "http://nancyfx.org/nancy-nuget.png"
-    },
-
-    "dependencies": {
-        "AsyncUsageAnalyzers": {
-            "type": "build",
-            "version": "1.0.0-alpha003"
-        }
-    },
-
-    "buildOptions": {
-        "xmlDoc": true,
-        "embed": [
-            "ErrorHandling/Resources/**/*.*",
-            "Diagnostics/Resources/**/*.*",
-            "Diagnostics/Views/**/*.*"
-        ]
-    },
-
-    "frameworks": {
-        "netstandard1.6": {
-            "buildOptions": {
-                "define": ["CORE"]
-            },
-            "dependencies": {
-                "Microsoft.CSharp": "4.0.1",
-                "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
-                "Microsoft.Extensions.DependencyModel": "1.0.0",
-                "System.Collections.Concurrent": "4.0.12",
-                "System.Collections.Specialized": "4.0.1",
-                "System.ComponentModel.TypeConverter": "4.1.0",
-                "System.Console": "4.0.0",
-                "System.Data.Common": "4.1.0",
-                "System.Diagnostics.Tools": "4.0.1",
-                "System.Dynamic.Runtime": "4.0.11",
-                "System.IO": "4.1.0",
-                "System.IO.FileSystem": "4.0.1",
-                "System.Linq": "4.1.0",
-                "System.Net.NameResolution": "4.0.0",
-                "System.Net.Primitives": "4.0.11",
-                "System.Reflection.Extensions": "4.0.1",
-                "System.Reflection.TypeExtensions": "4.1.0",
-                "System.Runtime": "4.1.0",
-                "System.Runtime.Serialization.Primitives": "4.1.1",
-                "System.Security.Claims": "4.0.1",
-                "System.Security.Cryptography.Algorithms": "4.2.0",
-                "System.Security.Cryptography.X509Certificates": "4.1.0",
-                "System.Text.RegularExpressions": "4.1.0",
-                "System.Threading.Thread": "4.0.0",
-                "System.Threading": "4.0.11",
-                "System.Xml.XmlSerializer": "4.0.11"
-            },
-            "imports": [
-                "dotnet5.4",
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Xml": { "type": "build" }
-            }
-        }
-    }
-}
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 0000000000..e405216650
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,46 @@
+<Project>
+  <PropertyGroup>
+    <DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net452' ">true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+    <DefineConstants>$(DefineConstants);CORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'MonoRelease' ">
+    <DefineConstants>$(DefineConstants);MONO</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ProjectUnderTest>$(MSBuildProjectName.Substring(0, $(MSBuildProjectName.IndexOf(".Tests"))))</ProjectUnderTest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../src/Nancy/Nancy.csproj" />
+    <ProjectReference Include="../../src/$(ProjectUnderTest)/$(ProjectUnderTest).csproj" />
+    <ProjectReference Include="../../src/Nancy.Testing/Nancy.Testing.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Nancy.Tests' and '$(MSBuildProjectName)' != 'Nancy.ViewEngines.Razor.Tests.Models' ">
+    <Compile Include="..\Nancy.Tests\Fakes\*.cs;..\Nancy.Tests\ShouldExtensions.cs;..\Nancy.Tests\xUnitExtensions\*.cs" Exclude="bin\**;obj\**;packages\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FakeItEasy" Version="3.0.0" />
+    <PackageReference Include="FakeItEasy.Analyzer" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta2-build3683" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Authentication.Basic.Tests.MSBuild/Nancy.Authentication.Basic.Tests.csproj b/test/Nancy.Authentication.Basic.Tests.MSBuild/Nancy.Authentication.Basic.Tests.csproj
deleted file mode 100644
index f6f4acdf51..0000000000
--- a/test/Nancy.Authentication.Basic.Tests.MSBuild/Nancy.Authentication.Basic.Tests.csproj
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2026DD2D-E041-4A14-8A04-D5B39B8B7C40}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Authentication.Basic.Tests</RootNamespace>
-    <AssemblyName>Nancy.Authentication.Basic.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Authentication.Basic.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Authentication.Basic.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRequest.cs">
-      <Link>Fakes\FakeRequest.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic.Tests\BasicAuthenticationConfigurationFixture.cs">
-      <Link>BasicAuthenticationConfigurationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Basic.Tests\BasicAuthenticationFixture.cs">
-      <Link>BasicAuthenticationFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Authentication.Basic.MSBuild\Nancy.Authentication.Basic.csproj">
-      <Project>{BD72B98D-C81A-4013-B606-94B4BA2273E5}</Project>
-      <Name>Nancy.Authentication.Basic</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Authentication.Basic.Tests.MSBuild/packages.config b/test/Nancy.Authentication.Basic.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Authentication.Basic.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj b/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj
new file mode 100644
index 0000000000..598e62356b
--- /dev/null
+++ b/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.xproj b/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.xproj
deleted file mode 100644
index dc369126f9..0000000000
--- a/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>51494B38-0D18-4B9D-AB75-39E804747D5F</ProjectGuid>
-    <RootNamespace>Nancy.Authentication.Basic.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Authentication.Basic.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Authentication.Basic.Tests/project.json b/test/Nancy.Authentication.Basic.Tests/project.json
deleted file mode 100644
index 8259653619..0000000000
--- a/test/Nancy.Authentication.Basic.Tests/project.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Authentication.Basic": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/Fakes/FakeRequest.cs",
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" }
-            }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Authentication.Forms.Tests.MSBuild/Nancy.Authentication.Forms.Tests.csproj b/test/Nancy.Authentication.Forms.Tests.MSBuild/Nancy.Authentication.Forms.Tests.csproj
deleted file mode 100644
index 7fc1d0e85e..0000000000
--- a/test/Nancy.Authentication.Forms.Tests.MSBuild/Nancy.Authentication.Forms.Tests.csproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4E974051-38C2-4B5D-A6B1-F265A428A673}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Authentication.Forms.Tests</RootNamespace>
-    <AssemblyName>Nancy.Authentication.Forms.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Authentication.Forms.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Authentication.Forms.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeDefaultNancyBootstrapper.cs">
-      <Link>Fakes\FakeDefaultNancyBootstrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeHookedModule.cs">
-      <Link>Fakes\FakeHookedModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeModuleCatalog.cs">
-      <Link>Fakes\FakeModuleCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModule.cs">
-      <Link>Fakes\FakeNancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleNoRoutes.cs">
-      <Link>Fakes\FakeNancyModuleNoRoutes.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithBasePath.cs">
-      <Link>Fakes\FakeNancyModuleWithBasePath.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithDependency.cs">
-      <Link>Fakes\FakeNancyModuleWithDependency.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithoutBasePath.cs">
-      <Link>Fakes\FakeNancyModuleWithoutBasePath.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithPreAndPostHooks.cs">
-      <Link>Fakes\FakeNancyModuleWithPreAndPostHooks.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeObjectSerializer.cs">
-      <Link>Fakes\FakeObjectSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRequest.cs">
-      <Link>Fakes\FakeRequest.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRoute.cs">
-      <Link>Fakes\FakeRoute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRouteCache.cs">
-      <Link>Fakes\FakeRouteCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRouteResolver.cs">
-      <Link>Fakes\FakeRouteResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\Person.cs">
-      <Link>Fakes\Person.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\ViewModel.cs">
-      <Link>Fakes\ViewModel.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Forms.Tests\FormsAuthenticationConfigurationFixture.cs">
-      <Link>FormsAuthenticationConfigurationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Authentication.Forms.Tests\FormsAuthenticationFixture.cs">
-      <Link>FormsAuthenticationFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Authentication.Forms.MSBuild\Nancy.Authentication.Forms.csproj">
-      <Project>{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}</Project>
-      <Name>Nancy.Authentication.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Authentication.Forms.Tests.MSBuild/packages.config b/test/Nancy.Authentication.Forms.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Authentication.Forms.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.csproj b/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.csproj
new file mode 100644
index 0000000000..598e62356b
--- /dev/null
+++ b/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.xproj b/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.xproj
deleted file mode 100644
index 54f10411c2..0000000000
--- a/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>93e15be9-bf06-4f94-a42f-bfd664774dc5</ProjectGuid>
-    <RootNamespace>Nancy.Authentication.Forms.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Authentication.Forms.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Authentication.Forms.Tests/project.json b/test/Nancy.Authentication.Forms.Tests/project.json
deleted file mode 100644
index 93729bb34b..0000000000
--- a/test/Nancy.Authentication.Forms.Tests/project.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Authentication.Forms": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/Fakes/FakeRequest.cs",
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" }
-            }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Embedded.Tests.MSBuild/Nancy.Embedded.Tests.csproj b/test/Nancy.Embedded.Tests.MSBuild/Nancy.Embedded.Tests.csproj
deleted file mode 100644
index 9c0023eaa6..0000000000
--- a/test/Nancy.Embedded.Tests.MSBuild/Nancy.Embedded.Tests.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6EED2486-39BF-491D-B033-720DFCFD1211}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Embedded.Tests</RootNamespace>
-    <AssemblyName>Nancy.Embedded.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Embedded.Tests\Unit\EmbeddedStaticContentConventionBuilderFixture.cs">
-      <Link>Unit\EmbeddedStaticContentConventionBuilderFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Embedded.MSBuild\Nancy.Embedded.csproj">
-      <Project>{d8eba39b-63ae-4a66-bd0e-f7f95e572135}</Project>
-      <Name>Nancy.Embedded</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.Embedded.Tests\Resources\embedded.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\embedded.txt</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.Embedded.Tests\Resources\Subfolder-with-hyphen\embedded3.txt">
-      <Link>Resources\Subfolder-with-hyphen\embedded3.txt</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.Embedded.Tests\Resources\Subfolder\embedded2.txt">
-      <Link>Resources\Subfolder\embedded2.txt</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Embedded.Tests.MSBuild/packages.config b/test/Nancy.Embedded.Tests.MSBuild/packages.config
deleted file mode 100644
index 15426f7161..0000000000
--- a/test/Nancy.Embedded.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.csproj b/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.csproj
new file mode 100644
index 0000000000..12ce1939c0
--- /dev/null
+++ b/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.xproj b/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.xproj
deleted file mode 100644
index 49048974dd..0000000000
--- a/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>838f9240-4541-4646-aac2-0eaa6f05a654</ProjectGuid>
-    <RootNamespace>Nancy.Embedded.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Embedded.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Embedded.Tests/project.json b/test/Nancy.Embedded.Tests/project.json
deleted file mode 100644
index c61d8aadfe..0000000000
--- a/test/Nancy.Embedded.Tests/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Embedded": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ],
-        "embed": "Resources/**/*.*"
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Encryption.MachineKey.Tests.MSBuild/Nancy.Encryption.MachineKey.Tests.csproj b/test/Nancy.Encryption.MachineKey.Tests.MSBuild/Nancy.Encryption.MachineKey.Tests.csproj
deleted file mode 100644
index b6cf764ffc..0000000000
--- a/test/Nancy.Encryption.MachineKey.Tests.MSBuild/Nancy.Encryption.MachineKey.Tests.csproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{429873F5-1E53-4ECC-A9EC-7950C789C6DF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Encryption.MachineKey.Tests</RootNamespace>
-    <AssemblyName>Nancy.Encryption.MachineKey.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Encryption.MachineKey.Tests\MachineConfigEncryptionProviderFixture.cs">
-      <Link>MachineConfigEncryptionProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Encryption.MachineKey.Tests\MachineKeyHmacProviderFixture.cs">
-      <Link>MachineKeyHmacProviderFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Encryption.MachineKey.MSBuild\Nancy.Encryption.MachineKey.csproj">
-      <Project>{14a66047-5f67-4774-b0e3-195d1d25b6a5}</Project>
-      <Name>Nancy.Encryption.MachineKey</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Encryption.MachineKey.Tests.MSBuild/packages.config b/test/Nancy.Encryption.MachineKey.Tests.MSBuild/packages.config
deleted file mode 100644
index 15426f7161..0000000000
--- a/test/Nancy.Encryption.MachineKey.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.csproj b/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.csproj
new file mode 100644
index 0000000000..0cde96dd4b
--- /dev/null
+++ b/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.xproj b/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.xproj
deleted file mode 100644
index af4acdfe15..0000000000
--- a/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>ff8c9795-2ad5-45e6-851d-6bdf8a7841ce</ProjectGuid>
-    <RootNamespace>Nancy.Encryption.MachineKey.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Encryption.MachineKey.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Encryption.MachineKey.Tests/project.json b/test/Nancy.Encryption.MachineKey.Tests/project.json
deleted file mode 100644
index 9ba07ba21b..0000000000
--- a/test/Nancy.Encryption.MachineKey.Tests/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Encryption.MachineKey": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Hosting.Aspnet.Tests.MSBuild/Nancy.Hosting.Aspnet.Tests.csproj b/test/Nancy.Hosting.Aspnet.Tests.MSBuild/Nancy.Hosting.Aspnet.Tests.csproj
deleted file mode 100644
index 285fb2e783..0000000000
--- a/test/Nancy.Hosting.Aspnet.Tests.MSBuild/Nancy.Hosting.Aspnet.Tests.csproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D0F1D7F4-0D48-49AE-9E33-005926B58B1D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Hosting.Aspnet.Tests</RootNamespace>
-    <AssemblyName>Nancy.Hosting.Aspnet.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Hosting.Aspnet.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Hosting.Aspnet.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Aspnet.Tests\NancyHandlerFixture.cs">
-      <Link>NancyHandlerFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Hosting.Aspnet.MSBuild\Nancy.Hosting.Aspnet.csproj">
-      <Project>{15B7F794-0BB2-4B66-AD78-4A951F1209B2}</Project>
-      <Name>Nancy.Hosting.Aspnet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Hosting.Aspnet.Tests.MSBuild/packages.config b/test/Nancy.Hosting.Aspnet.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Hosting.Aspnet.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.csproj b/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.csproj
new file mode 100644
index 0000000000..3efc95e085
--- /dev/null
+++ b/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Web" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.xproj b/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.xproj
deleted file mode 100644
index f5607282b9..0000000000
--- a/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>98067ec0-5028-432f-b94a-99195d70b76f</ProjectGuid>
-    <RootNamespace>Nancy.Hosting.Aspnet.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Hosting.Aspnet.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Hosting.Aspnet.Tests/project.json b/test/Nancy.Hosting.Aspnet.Tests/project.json
deleted file mode 100644
index fd8ed817be..0000000000
--- a/test/Nancy.Hosting.Aspnet.Tests/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Hosting.Aspnet": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Hosting.Self.Tests.MSBuild/Nancy.Hosting.Self.Tests.csproj b/test/Nancy.Hosting.Self.Tests.MSBuild/Nancy.Hosting.Self.Tests.csproj
deleted file mode 100644
index 1dc6ca56ad..0000000000
--- a/test/Nancy.Hosting.Self.Tests.MSBuild/Nancy.Hosting.Self.Tests.csproj
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CA24ED85-DD68-4C10-B80A-D81C6745FCB8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Hosting.Self.Tests</RootNamespace>
-    <AssemblyName>Nancy.Hosting.Self.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Hosting.Self.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE;MONO</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType></DebugType>
-    <PlatformTarget>anycpu</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Hosting.Self.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\SkipException.cs">
-      <Link>SkipException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\SkippableFactAttribute.cs">
-      <Link>SkippableFactAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self.Tests\IsCaseInstensitiveBaseOfFixture.cs">
-      <Link>IsCaseInstensitiveBaseOfFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self.Tests\MakeAppLocalPathFixture.cs">
-      <Link>MakeAppLocalPathFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self.Tests\NancySelfHostFixture.cs">
-      <Link>NancySelfHostFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Hosting.Self.Tests\TestModule.cs">
-      <Link>TestModule.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Hosting.Self.MSBuild\Nancy.Hosting.Self.csproj">
-      <Project>{AA7F66EB-EC2C-47DE-855F-30B3E6EF2134}</Project>
-      <Name>Nancy.Hosting.Self</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Hosting.Self.Tests.MSBuild/packages.config b/test/Nancy.Hosting.Self.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Hosting.Self.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj b/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj
new file mode 100644
index 0000000000..f2c54b0e39
--- /dev/null
+++ b/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="..\Nancy.Tests\Fakes\FakeDefaultNancyBootstrapper.cs" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'MonoRelease' ">
+    <DefineConstants>$(DefineConstants);MONO</DefineConstants>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.xproj b/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.xproj
deleted file mode 100644
index e99dfa6317..0000000000
--- a/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>21aa5847-70df-4c96-9aed-1c9a9af9325c</ProjectGuid>
-    <RootNamespace>Nancy.Hosting.Self.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Hosting.Self.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Hosting.Self.Tests/project.json b/test/Nancy.Hosting.Self.Tests/project.json
deleted file mode 100644
index eaba21e389..0000000000
--- a/test/Nancy.Hosting.Self.Tests/project.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Hosting.Self": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs",
-            "../Nancy.Tests/xUnitExtensions/SkipException.cs",
-            "../Nancy.Tests/xUnitExtensions/SkippableFactAttribute.cs"
-        ]
-    },
-
-    "configurations" : {
-        "MonoRelease": {
-             "buildOptions": {
-                "define": ["MONO"],
-                "optimize": true
-              }
-        }
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Metadata.Modules.Tests.MSBuild/Nancy.Metadata.Modules.Tests.csproj b/test/Nancy.Metadata.Modules.Tests.MSBuild/Nancy.Metadata.Modules.Tests.csproj
deleted file mode 100644
index e8b80036e9..0000000000
--- a/test/Nancy.Metadata.Modules.Tests.MSBuild/Nancy.Metadata.Modules.Tests.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{508A3A68-2012-4E62-925F-2F3083A013FC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Metadata.Modules.Tests</RootNamespace>
-    <AssemblyName>Nancy.Metadata.Modules.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\DefaultMetadataModuleConventionsFixture.cs">
-      <Link>DefaultMetadataModuleConventionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\FakeNancyMetadataModule.cs">
-      <Link>FakeNancyMetadataModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\FakeNancyModule.cs">
-      <Link>FakeNancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\MetadataModuleFixture.cs">
-      <Link>MetadataModuleFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\MetadataModuleRouteMetadataProviderFixture.cs">
-      <Link>MetadataModuleRouteMetadataProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\Modules\FakeNancyModule.cs">
-      <Link>Modules\FakeNancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Metadata.Modules.Tests\Metadata\FakeNancyMetadataModule.cs">
-      <Link>Metadata\FakeNancyMetadataModule.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Metadata.Modules.MSBuild\Nancy.Metadata.Modules.csproj">
-      <Project>{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}</Project>
-      <Name>Nancy.Metadata.Modules</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Metadata.Modules.Tests.MSBuild/packages.config b/test/Nancy.Metadata.Modules.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Metadata.Modules.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.csproj b/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.csproj
new file mode 100644
index 0000000000..598e62356b
--- /dev/null
+++ b/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.xproj b/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.xproj
deleted file mode 100644
index b64c511393..0000000000
--- a/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>e5047274-5a15-41c6-986f-a6a36588a012</ProjectGuid>
-    <RootNamespace>Nancy.Metadata.Modules.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Metadata.Modules.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Metadata.Modules.Tests/project.json b/test/Nancy.Metadata.Modules.Tests/project.json
deleted file mode 100644
index db328a7450..0000000000
--- a/test/Nancy.Metadata.Modules.Tests/project.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Metadata.Modules": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Owin.Tests.MSBuild/Nancy.Owin.Tests.csproj b/test/Nancy.Owin.Tests.MSBuild/Nancy.Owin.Tests.csproj
deleted file mode 100644
index af7e4aebc7..0000000000
--- a/test/Nancy.Owin.Tests.MSBuild/Nancy.Owin.Tests.csproj
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Owin.Tests</RootNamespace>
-    <AssemblyName>Nancy.Owin.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE;MONO</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType></DebugType>
-    <PlatformTarget>anycpu</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="OwinHttpMessageHandler, Version=1.3.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OwinHttpMessageHandler.1.3.5\lib\net45\OwinHttpMessageHandler.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Owin.Tests\AppBuilderExtensionsFixture.cs">
-      <Link>AppBuilderExtensionsFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Owin.MSBuild\Nancy.Owin.csproj">
-      <Project>{D6B2480C-2A52-4D02-9477-D387D7A486E5}</Project>
-      <Name>Nancy.Owin</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj">
-      <Project>{d79203c0-b672-4751-9c95-c3ab7d3fefbe}</Project>
-      <Name>Nancy.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Nancy.Owin.Tests\app.config">
-      <Link>app.config</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Owin.Tests.MSBuild/packages.config b/test/Nancy.Owin.Tests.MSBuild/packages.config
deleted file mode 100644
index b7a86f6fca..0000000000
--- a/test/Nancy.Owin.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Bcl" version="1.1.7" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net45" />
-  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net45" />
-  <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="OwinHttpMessageHandler" version="1.3.5" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Owin.Tests/Nancy.Owin.Tests.csproj b/test/Nancy.Owin.Tests/Nancy.Owin.Tests.csproj
new file mode 100644
index 0000000000..eb75a1a6c0
--- /dev/null
+++ b/test/Nancy.Owin.Tests/Nancy.Owin.Tests.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Owin" Version="3.0.1" />
+    <PackageReference Include="OwinHttpMessageHandler" Version="1.3.5" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Owin.Tests/Nancy.Owin.Tests.xproj b/test/Nancy.Owin.Tests/Nancy.Owin.Tests.xproj
deleted file mode 100644
index 585a2840f0..0000000000
--- a/test/Nancy.Owin.Tests/Nancy.Owin.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>10771591-d09d-4fcc-990e-3982006fb1fa</ProjectGuid>
-    <RootNamespace>Nancy.Owin.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Owin.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Owin.Tests/app.config b/test/Nancy.Owin.Tests/app.config
deleted file mode 100644
index 99ed16357e..0000000000
--- a/test/Nancy.Owin.Tests/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/test/Nancy.Owin.Tests/project.json b/test/Nancy.Owin.Tests/project.json
deleted file mode 100644
index 0608cf3ade..0000000000
--- a/test/Nancy.Owin.Tests/project.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "OwinHttpMessageHandler": "1.3.5",
-        "Microsoft.Owin": "3.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Owin": { "target": "project" },
-        "Nancy.Testing": { "target": "project" },
-        "xunit": "2.2.0",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0"
-    },
-
-    "buildOptions": {
-        "compileFiles": [
-            "../Nancy.Tests/Fakes/FakeRequest.cs",
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "configurations" : {
-        "MonoRelease": {
-             "buildOptions": {
-                "define": ["MONO"],
-                "optimize": true
-              }
-        }
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Testing.Tests.MSBuild/Nancy.Testing.Tests.csproj b/test/Nancy.Testing.Tests.MSBuild/Nancy.Testing.Tests.csproj
deleted file mode 100644
index 7ec0e9bc06..0000000000
--- a/test/Nancy.Testing.Tests.MSBuild/Nancy.Testing.Tests.csproj
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8EB9E15A-4B65-4C80-B834-9A7773750666}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Testing.Tests</RootNamespace>
-    <AssemblyName>Nancy.Testing.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Testing.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE;MONO</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>
-    </DebugType>
-    <PlatformTarget>anycpu</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Testing.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.XML" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\RecordAsync.cs">
-      <Link>RecordAsync.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\AndConnectorTests.cs">
-      <Link>AndConnectorTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\AssertEqualityComparerFixture.cs">
-      <Link>AssertEqualityComparerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\BrowserContextExtensionsFixture.cs">
-      <Link>BrowserContextExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\BrowserDefaultsFixture.cs">
-      <Link>BrowserDefaultsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\BrowserResponseBodyWrapperExtensionsFixture.cs">
-      <Link>BrowserResponseBodyWrapperExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\BrowserResponseBodyWrapperFixture.cs">
-      <Link>BrowserResponseBodyWrapperFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\BrowserResponseExtensionsTests.cs">
-      <Link>BrowserResponseExtensionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\CaseSensitivityFixture.cs">
-      <Link>CaseSensitivityFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\TestingViewExtensions\GetModuleNameExtensionTests.cs">
-      <Link>TestingViewExtensions\GetModuleNameExtensionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\TestingViewExtensions\GetModulePathExtensionMethodTests.cs">
-      <Link>TestingViewExtensions\GetModulePathExtensionMethodTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\TestingViewExtensions\GetViewNameExtensionTests.cs">
-      <Link>TestingViewExtensions\GetViewNameExtensionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\TestingViewExtensions\GetModelExtententionsTests.cs">
-      <Link>TestingViewExtensions\GetModelExtententionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\ConfigurableBootstrapperDependenciesTests.cs">
-      <Link>ConfigurableBootstrapperDependenciesTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\ConfigurableBootstrapperFixture.cs">
-      <Link>ConfigurableBootstrapperFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\ContextExtensionsTests.cs">
-      <Link>ContextExtensionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\DocumentWrapperTests.cs">
-      <Link>DocumentWrapperTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\PathHelperTests.cs">
-      <Link>PathHelperTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\QueryWrapperTests.cs">
-      <Link>QueryWrapperTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\AssertExtensionsTests.cs">
-      <Link>AssertExtensionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\BrowserFixture.cs">
-      <Link>BrowserFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Testing.Tests\TestingViewExtensions\TestingViewFactoryTestModule.cs">
-      <Link>TestingViewExtensions\TestingViewFactoryTestModule.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Authentication.Forms.MSBuild\Nancy.Authentication.Forms.csproj">
-      <Project>{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}</Project>
-      <Name>Nancy.Authentication.Forms</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj">
-      <Project>{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}</Project>
-      <Name>Nancy.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="..\Nancy.Testing.Tests\TestingViewExtensions\ViewFactoryTest.sshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestingViewExtensions\ViewFactoryTest.sshtml</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Testing.Tests.MSBuild/packages.config b/test/Nancy.Testing.Tests.MSBuild/packages.config
deleted file mode 100644
index e001822045..0000000000
--- a/test/Nancy.Testing.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Testing.Tests/Nancy.Testing.Tests.csproj b/test/Nancy.Testing.Tests/Nancy.Testing.Tests.csproj
new file mode 100644
index 0000000000..1bb9bbd0d5
--- /dev/null
+++ b/test/Nancy.Testing.Tests/Nancy.Testing.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="TestingViewExtensions\ViewFactoryTest.sshtml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="0.9.8.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Testing.Tests/Nancy.Testing.Tests.xproj b/test/Nancy.Testing.Tests/Nancy.Testing.Tests.xproj
deleted file mode 100644
index 9981fba290..0000000000
--- a/test/Nancy.Testing.Tests/Nancy.Testing.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>ceff8372-2f7a-41cb-8f13-164abba8aca2</ProjectGuid>
-    <RootNamespace>Nancy.Testing.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Testing.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Testing.Tests/project.json b/test/Nancy.Testing.Tests/project.json
deleted file mode 100644
index a0b4545dd7..0000000000
--- a/test/Nancy.Testing.Tests/project.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "dependencies": {
-        "AngleSharp": "0.9.8.1",
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Testing": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs",
-            "../Nancy.Tests/xUnitExtensions/RecordAsync.cs"
-        ],
-        "copyToOutput": [
-            "TestingViewExtensions/ViewFactoryTest.sshtml"
-        ]
-    },
-
-    "configurations" : {
-        "MonoRelease": {
-             "buildOptions": {
-                "define": ["MONO"],
-                "optimize": true
-              }
-        }
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" }
-            }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Tests.Functional.MSBuild/Nancy.Tests.Functional.csproj b/test/Nancy.Tests.Functional.MSBuild/Nancy.Tests.Functional.csproj
deleted file mode 100644
index 4b30123319..0000000000
--- a/test/Nancy.Tests.Functional.MSBuild/Nancy.Tests.Functional.csproj
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Tests.Functional</RootNamespace>
-    <AssemblyName>Nancy.Tests.Functional</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\MonoRelease</OutputPath>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\MonoDebug</OutputPath>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\JsonLdProcessor.cs">
-      <Link>Tests\JsonLdProcessor.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\RecordAsync.cs">
-      <Link>RecordAsync.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\AbsoluteUrlTestModule.cs">
-      <Link>Modules\AbsoluteUrlTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\CookieModule.cs">
-      <Link>Modules\CookieModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\PerRouteAuthModule.cs">
-      <Link>Modules\PerRouteAuthModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\RazorWithTracingTestModule.cs">
-      <Link>Modules\RazorWithTracingTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\JsonpTestModule.cs">
-      <Link>Modules\JsonpTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\RazorTestModule.cs">
-      <Link>Modules\RazorTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\SerializerTestModule.cs">
-      <Link>Modules\SerializerTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\ThrowingModule.cs">
-      <Link>Modules\ThrowingModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\AbsoluteUrlTests.cs">
-      <Link>Tests\AbsoluteUrlTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\AsyncExceptionTests.cs">
-      <Link>Tests\AsyncExceptionTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\BasicRouteInvocationsFixture.cs">
-      <Link>Tests\BasicRouteInvocationsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Modules\SerializeTestModule.cs">
-      <Link>Modules\SerializeTestModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\ContentNegotiationFixture.cs">
-      <Link>Tests\ContentNegotiationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\CookieFixture.cs">
-      <Link>Tests\CookieFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\MethodRewriteFixture.cs">
-      <Link>Tests\MethodRewriteFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\PerRouteAuthFixture.cs">
-      <Link>Tests\PerRouteAuthFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\RouteConstraintTests.cs">
-      <Link>Tests\RouteConstraintTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\SerializerTests.cs">
-      <Link>Tests\SerializerTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\TracingSmokeTests.cs">
-      <Link>Tests\TracingSmokeTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\JsonpTests.cs">
-      <Link>Tests\JsonpTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\ModelBindingTests.cs">
-      <Link>Tests\ModelBindingTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\ManualStaticContentTests.cs">
-      <Link>Tests\ManualStaticContentTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\PartialViewTests.cs">
-      <Link>Tests\PartialViewTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\ViewBagTests.cs">
-      <Link>Tests\ViewBagTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests.Functional\Tests\SerializeTests.cs">
-      <Link>Tests\SerializeTests.cs</Link>
-    </Compile>
-    <Compile Include="Tests\DefaultXmlSerializerTests.cs" />
-    <Compile Include="Tests\DefaultJsonSerializerTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj">
-      <Project>{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}</Project>
-      <Name>Nancy.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.ViewEngines.Razor.MSBuild\Nancy.ViewEngines.Razor.csproj">
-      <Project>{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}</Project>
-      <Name>Nancy.ViewEngines.Razor</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\Nancy.Tests.Functional\Content\smiley.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Content\smiley.png</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests.Functional\Hidden.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Hidden.txt</Link>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="..\Nancy.Tests.Functional\Views\RazorPageWithUnknownPartial.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\RazorPageWithUnknownPartial.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.Tests.Functional\Views\_PartialTest.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\_PartialTest.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.Tests.Functional\Views\_LayoutPage.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\_LayoutPage.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.Tests.Functional\Views\_ViewStart.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\_ViewStart.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.Tests.Functional\Views\RazorPage.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\RazorPage.cshtml</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Tests.Functional.MSBuild/Tests/DefaultJsonSerializerTests.cs b/test/Nancy.Tests.Functional.MSBuild/Tests/DefaultJsonSerializerTests.cs
deleted file mode 100644
index ada15ed018..0000000000
--- a/test/Nancy.Tests.Functional.MSBuild/Tests/DefaultJsonSerializerTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-namespace Nancy.Tests.Functional.Tests
-{
-    using Nancy.Configuration;
-    using Nancy.Json;
-    using Nancy.Responses;
-    using Xunit;
-
-    public class DefaultJsonSerializerTests
-    {
-        private readonly DefaultJsonSerializer jsonSerializer;
-
-        public DefaultJsonSerializerTests()
-        {
-            var environment =
-                new DefaultNancyEnvironment();
-
-            environment.Tracing(
-                enabled: true,
-                displayErrorTraces: true);
-            environment.Json();
-            environment.Globalization(new[] { "en-US" });
-
-            this.jsonSerializer = new DefaultJsonSerializer(environment);
-        }
-
-        [Fact]
-        public void Can_serialize_application_json()
-        {
-            Assert.True(this.jsonSerializer.CanSerialize("application/json"));
-        }
-
-        [Fact]
-        public void Can_serialize_type_starting_with_application_json()
-        {
-            Assert.True(this.jsonSerializer.CanSerialize("application/json-blah"));
-        }
-
-        [Fact]
-        public void Can_serialize_text_json()
-        {
-            Assert.True(this.jsonSerializer.CanSerialize("text/json"));
-        }
-
-        [Fact]
-        public void Can_serialize_vendor_json()
-        {
-            Assert.True(this.jsonSerializer.CanSerialize("application/vnd.someorganisation.user+json"));
-        }
-
-        [Fact]
-        public void Can_serialize_problem_json()
-        {
-            Assert.True(this.jsonSerializer.CanSerialize("application/problem+json"));
-        }
-
-        [Fact]
-        public void Cannot_serialize_xml()
-        {
-            Assert.False(this.jsonSerializer.CanSerialize("application/xml"));
-        }
-
-        [Fact]
-        public void Should_ignore_parameters()
-        {
-            Assert.True(this.jsonSerializer.CanSerialize("application/vnd.someorganisation.user+json; version=1"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Nancy.Tests.Functional.MSBuild/Tests/DefaultXmlSerializerTests.cs b/test/Nancy.Tests.Functional.MSBuild/Tests/DefaultXmlSerializerTests.cs
deleted file mode 100644
index 37b8c57eee..0000000000
--- a/test/Nancy.Tests.Functional.MSBuild/Tests/DefaultXmlSerializerTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-namespace Nancy.Tests.Functional.Tests
-{
-    using Nancy.Configuration;
-    using Nancy.Responses;
-    using Nancy.Xml;
-    using Xunit;
-
-    public class DefaultXmlSerializerTests
-    {
-        private readonly DefaultXmlSerializer xmlSerializer;
-
-        public DefaultXmlSerializerTests()
-        {
-            var environment =
-                new DefaultNancyEnvironment();
-
-            environment.Tracing(
-                enabled: true,
-                displayErrorTraces: true);
-            environment.Xml(true);
-            environment.Globalization(new[] { "en-US" });
-
-            this.xmlSerializer = new DefaultXmlSerializer(environment);
-        }
-
-        [Fact]
-        public void Can_serialize_application_xml()
-        {
-            Assert.True(this.xmlSerializer.CanSerialize("application/xml"));
-        }
-
-        [Fact]
-        public void Can_serialize_type_starting_with_application_xml()
-        {
-            Assert.True(this.xmlSerializer.CanSerialize("application/xml-blah"));
-        }
-
-        [Fact]
-        public void Can_serialize_text_xml()
-        {
-            Assert.True(this.xmlSerializer.CanSerialize("text/xml"));
-        }
-
-        [Fact]
-        public void Can_serialize_vendor_xml()
-        {
-            Assert.True(this.xmlSerializer.CanSerialize("application/vnd.someorganisation.user+xml"));
-        }
-
-        [Fact]
-        public void Can_serialize_problem_xml()
-        {
-            Assert.True(this.xmlSerializer.CanSerialize("application/problem+xml"));
-        }
-
-        [Fact]
-        public void Cannot_serialize_json()
-        {
-            Assert.False(this.xmlSerializer.CanSerialize("application/json"));
-        }
-
-        [Fact]
-        public void Should_ignore_parameters()
-        {
-            Assert.True(this.xmlSerializer.CanSerialize("application/vnd.someorganisation.user+xml; version=1"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Nancy.Tests.Functional.MSBuild/packages.config b/test/Nancy.Tests.Functional.MSBuild/packages.config
deleted file mode 100644
index 15426f7161..0000000000
--- a/test/Nancy.Tests.Functional.MSBuild/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Tests.Functional/Nancy.Tests.Functional.csproj b/test/Nancy.Tests.Functional/Nancy.Tests.Functional.csproj
new file mode 100644
index 0000000000..710cd52072
--- /dev/null
+++ b/test/Nancy.Tests.Functional/Nancy.Tests.Functional.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="Content\**\*;Views\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <ProjectReference Include="../../src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Tests.Functional/Nancy.Tests.Functional.xproj b/test/Nancy.Tests.Functional/Nancy.Tests.Functional.xproj
deleted file mode 100644
index 593c7d3f18..0000000000
--- a/test/Nancy.Tests.Functional/Nancy.Tests.Functional.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>742ac687-fc9a-4534-bb50-3d91738563a7</ProjectGuid>
-    <RootNamespace>Nancy.Tests.Functional</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Tests.Functional</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Tests.Functional/Tests/PartialViewTests.cs b/test/Nancy.Tests.Functional/Tests/PartialViewTests.cs
index 0daa6d6aee..7097241454 100644
--- a/test/Nancy.Tests.Functional/Tests/PartialViewTests.cs
+++ b/test/Nancy.Tests.Functional/Tests/PartialViewTests.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP1_0
+#if !CORE
 namespace Nancy.Tests.Functional.Tests
 {
     using System;
@@ -41,7 +41,7 @@ public async Task When_Using_Partial_View_Then_First_Index_Of_ViewStart_Should_E
 
             var firstIndex = body.IndexOf(@"Hello World, this is the View Start...", StringComparison.Ordinal);
             var lastIndex = body.LastIndexOf(@"Hello World, this is the View Start...", StringComparison.Ordinal);
-            
+
             // If the index is not the same then the string occurs twice...
             Assert.Equal(firstIndex, lastIndex);
         }
diff --git a/test/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs b/test/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs
index 99c99fb922..a5de8fefaa 100644
--- a/test/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs
+++ b/test/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP1_0
+#if !CORE
 namespace Nancy.Tests.Functional.Tests
 {
     using System;
diff --git a/test/Nancy.Tests.Functional/Tests/ViewBagTests.cs b/test/Nancy.Tests.Functional/Tests/ViewBagTests.cs
index c2b440b944..5f51d2c1a3 100644
--- a/test/Nancy.Tests.Functional/Tests/ViewBagTests.cs
+++ b/test/Nancy.Tests.Functional/Tests/ViewBagTests.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP1_0
+#if !CORE
 namespace Nancy.Tests.Functional.Tests
 {
     using System.Threading.Tasks;
@@ -12,7 +12,7 @@ public class ViewBagTests
         private readonly INancyBootstrapper bootstrapper;
 
         private readonly Browser browser;
-        
+
         public ViewBagTests()
         {
             this.bootstrapper = new ConfigurableBootstrapper(
@@ -64,7 +64,7 @@ public async Task Should_serialize_ViewBag()
                     with.HttpRequest();
                     with.Accept("application/json");
                 });
-                
+
             // When
             var model = response.Body.DeserializeJson<ViewBagModel>();
 
diff --git a/test/Nancy.Tests.Functional/project.json b/test/Nancy.Tests.Functional/project.json
deleted file mode 100644
index 1d33c4a404..0000000000
--- a/test/Nancy.Tests.Functional/project.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": {
-            "target": "project"
-        },
-        "Nancy.Testing": {
-            "target": "project"
-        },
-        "xunit": "2.2.0"
-    },
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/xUnitExtensions/RecordAsync.cs"
-        ],
-        "copyToOutput": [
-            "Content/**/*",
-            "Views/**/*"
-        ]
-    },
-    "frameworks": {
-        "netcoreapp1.0": {
-            "buildOptions": {
-                "define": [
-                    "CORE"
-                ]
-            },
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.1"
-                }
-            },
-            "imports": [
-                "dotnet",
-                "portable-net451+win8"
-            ]
-        },
-        "net452": {
-            "dependencies": {
-                "Nancy.ViewEngines.Razor": {
-                    "target": "project"
-                }
-            },
-            "frameworkAssemblies": {
-                "System.Runtime": {
-                    "type": "build"
-                },
-                "System.Threading.Tasks": {
-                    "type": "build"
-                }
-            }
-        }
-    },
-    "testRunner": "xunit"
-}
\ No newline at end of file
diff --git a/test/Nancy.Tests.MSBuild/Nancy.Tests.csproj b/test/Nancy.Tests.MSBuild/Nancy.Tests.csproj
deleted file mode 100644
index 46ad48b900..0000000000
--- a/test/Nancy.Tests.MSBuild/Nancy.Tests.csproj
+++ /dev/null
@@ -1,750 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{776D244D-BC4D-4BBB-A478-CAF2D04520E1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Tests</RootNamespace>
-    <AssemblyName>Nancy.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE;MONO</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>
-    </DebugType>
-    <PlatformTarget>anycpu</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\Fakes\PersonWithAgeField.cs">
-      <Link>Fakes\PersonWithAgeField.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\StructModel.cs">
-      <Link>Fakes\StructModel.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Helpers\ExceptionExtensionsFixture.cs">
-      <Link>Helpers\ExceptionExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\NoAppStartupsFixture.cs">
-      <Link>NoAppStartupsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Extensions\ResponseExtensions.cs">
-      <Link>Extensions\ResponseExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleNoRoutes.cs">
-      <Link>Fakes\FakeNancyModuleNoRoutes.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithBasePath.cs">
-      <Link>Fakes\FakeNancyModuleWithBasePath.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithDependency.cs">
-      <Link>Fakes\FakeNancyModuleWithDependency.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithoutBasePath.cs">
-      <Link>Fakes\FakeNancyModuleWithoutBasePath.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModuleWithPreAndPostHooks.cs">
-      <Link>Fakes\FakeNancyModuleWithPreAndPostHooks.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRoute.cs">
-      <Link>Fakes\FakeRoute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRouteResolver.cs">
-      <Link>Fakes\FakeRouteResolver.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeObjectSerializer.cs">
-      <Link>Fakes\FakeObjectSerializer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeHookedModule.cs">
-      <Link>Fakes\FakeHookedModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeViewEngineHost.cs">
-      <Link>Fakes\FakeViewEngineHost.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\MockPipelines.cs">
-      <Link>Fakes\MockPipelines.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\Person.cs">
-      <Link>Fakes\Person.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\ViewModel.cs">
-      <Link>Fakes\ViewModel.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Helpers\CacheHelpersFixture.cs">
-      <Link>Helpers\CacheHelpersFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Resources\Link.Texts.Designer.cs">
-      <DependentUpon>Link.Texts.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <Link>Resources\Link.Texts.Designer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Resources\Menu.Texts.Designer.cs">
-      <DependentUpon>Menu.Texts.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <Link>Resources\Menu.Texts.Designer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Resources\Menu.Designer.cs">
-      <DependentUpon>Menu.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <Link>Resources\Menu.Designer.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Responses\MaterialisingResponseFixture.cs">
-      <Link>Responses\MaterialisingResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\BootstrapperLocatorFixture.cs">
-      <Link>Unit\Bootstrapper\BootstrapperLocatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\CollectionTypeRegistrationFixture.cs">
-      <Link>Unit\Bootstrapper\CollectionTypeRegistrationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\InstanceRegistrationFixture.cs">
-      <Link>Unit\Bootstrapper\InstanceRegistrationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\NancyBootstrapperWithRequestContainerBaseFixture.cs">
-      <Link>Unit\Bootstrapper\NancyBootstrapperWithRequestContainerBaseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\PipelinesFixture.cs">
-      <Link>Unit\Bootstrapper\PipelinesFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Configuration\DefaultNancyEnvironmentConfiguratorFixture.cs">
-      <Link>Unit\Configuration\DefaultNancyEnvironmentConfiguratorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Configuration\DefaultNancyEnvironmentFactoryFixture.cs">
-      <Link>Unit\Configuration\DefaultNancyEnvironmentFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Configuration\DefaultNancyEnvironmentFixture.cs">
-      <Link>Unit\Configuration\DefaultNancyEnvironmentFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Configuration\INancyEnvironmentExtensionsFixture.cs">
-      <Link>Unit\Configuration\INancyEnvironmentExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Conventions\DefaultAcceptHeaderCoercionConventionsFixture.cs">
-      <Link>Unit\Conventions\DefaultAcceptHeaderCoercionConventionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Conventions\DefaultCultureConventionsFixture.cs">
-      <Link>Unit\Conventions\DefaultCultureConventionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Conventions\DefaultStaticContentsConventionsFixture.cs">
-      <Link>Unit\Conventions\DefaultStaticContentsConventionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Culture\BuiltInCultureConventionFixture.cs">
-      <Link>Unit\Culture\BuiltInCultureConventionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DefaultNancyBootstrapperFixture.cs">
-      <Link>Unit\DefaultNancyBootstrapperFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DefaultResponseFormatterFactoryFixture.cs">
-      <Link>Unit\DefaultResponseFormatterFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DefaultSerializerFactoryFixture.cs">
-      <Link>Unit\DefaultSerializerFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Diagnostics\ConcurrentLimitedCollectionFixture.cs">
-      <Link>Unit\Diagnostics\ConcurrentLimitedCollectionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Diagnostics\CustomInteractiveDiagnosticsFixture.cs">
-      <Link>Unit\Diagnostics\CustomInteractiveDiagnosticsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Diagnostics\DefaultRequestTraceFactoryFixture.cs">
-      <Link>Unit\Diagnostics\DefaultRequestTraceFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Diagnostics\DiagnosticsHookFixture.cs">
-      <Link>Unit\Diagnostics\DiagnosticsHookFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Diagnostics\InteractiveDiagnosticsFixture.cs">
-      <Link>Unit\Diagnostics\InteractiveDiagnosticsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ErrorHandling\DefaultStatusCodeHandlerFixture.cs">
-      <Link>Unit\ErrorHandling\DefaultStatusCodeHandlerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Extensions\StreamExtensionsFixture.cs">
-      <Link>Unit\Extensions\StreamExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Extensions\TypeExtensionsFixture.cs">
-      <Link>Unit\Extensions\TypeExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\FormatterExtensionsFixture.cs">
-      <Link>Unit\FormatterExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Helpers\HttpUtilityFixture.cs">
-      <Link>Unit\Helpers\HttpUtilityFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HttpLinkBuilderFixture.cs">
-      <Link>Unit\HttpLinkBuilderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HttpLinkFixture.cs">
-      <Link>Unit\HttpLinkFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HttpLinkRelationFixture.cs">
-      <Link>Unit\HttpLinkRelationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\JsonSerializerFixture.cs">
-      <Link>Unit\JsonSerializerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\JavaScriptSerializerFixture.cs">
-      <Link>Unit\Json\JavaScriptSerializerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\SimpleJsonFixture.cs">
-      <Link>Unit\Json\SimpleJsonFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\Simple\NancySerializationStrategyFixture.cs">
-      <Link>Unit\Json\Simple\NancySerializationStrategyFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\TestConverter.cs">
-      <Link>Unit\Json\TestConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\TestConverterType.cs">
-      <Link>Unit\Json\TestConverterType.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\TestData.cs">
-      <Link>Unit\Json\TestData.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\TestPrimitiveConverter.cs">
-      <Link>Unit\Json\TestPrimitiveConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\TestPrimitiveConverterType.cs">
-      <Link>Unit\Json\TestPrimitiveConverterType.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Json\TypeWithTuple.cs">
-      <Link>Unit\Json\TypeWithTuple.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\MimeTypesFixture.cs">
-      <Link>Unit\MimeTypesFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\BindingMemberInfoFixture.cs">
-      <Link>Unit\ModelBinding\BindingMemberInfoFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\ModelBindingExceptionFixture.cs">
-      <Link>Unit\ModelBinding\ModelBindingExceptionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\PropertyBindingExceptionFixture.cs">
-      <Link>Unit\ModelBinding\PropertyBindingExceptionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NamedPipelineBaseFixture.cs">
-      <Link>Unit\NamedPipelineBaseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModuleNameFixture.cs">
-      <Link>Unit\ModuleNameFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyContextFixture.cs">
-      <Link>Unit\NancyContextFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Resources\Views\SuperSimpleViewEngineSampleContent.cs">
-      <Link>Resources\Views\SuperSimpleViewEngineSampleContent.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\Base\BootstrapperBaseFixtureBase.cs">
-      <Link>Unit\Bootstrapper\Base\BootstrapperBaseFixtureBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\Base\ModuleCatalogFixtureBase.cs">
-      <Link>Unit\Bootstrapper\Base\ModuleCatalogFixtureBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\NancyInternalConfigurationFixture.cs">
-      <Link>Unit\Bootstrapper\NancyInternalConfigurationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\TypeRegistrationFixture.cs">
-      <Link>Unit\Bootstrapper\TypeRegistrationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Conventions\DefaultViewLocationConventionsFixture.cs">
-      <Link>Unit\Conventions\DefaultViewLocationConventionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Cryptography\DefaultHmacProviderFixture.cs">
-      <Link>Unit\Cryptography\DefaultHmacProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Cryptography\HmacComparerFixture.cs">
-      <Link>Unit\Cryptography\HmacComparerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Cryptography\NoEncryptionProviderFixture.cs">
-      <Link>Unit\Cryptography\NoEncryptionProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Cryptography\AesEncryptionProviderFixture.cs">
-      <Link>Unit\Cryptography\AesEncryptionProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DefaultNancyBootstrapperModuleCatalogFixture.cs">
-      <Link>Unit\DefaultNancyBootstrapperModuleCatalogFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Extensions\ContextExtensionsFixture.cs">
-      <Link>Unit\Extensions\ContextExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Extensions\RequestExtensionsFixture.cs">
-      <Link>Unit\Extensions\RequestExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HttpMultipartBoundaryFixture.cs">
-      <Link>Unit\HttpMultipartBoundaryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HttpMultipartBufferFixture.cs">
-      <Link>Unit\HttpMultipartBufferFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HttpMultipartFixture.cs">
-      <Link>Unit\HttpMultipartFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\IO\RequestStreamFixture.cs">
-      <Link>Unit\IO\RequestStreamFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\JsonFormatterExtensionsFixtures.cs">
-      <Link>Unit\JsonFormatterExtensionsFixtures.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Bootstrapper\NancyBootstrapperBaseFixture.cs">
-      <Link>Unit\Bootstrapper\NancyBootstrapperBaseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DefaultNancyBootstrapperBootstrapperBaseFixture.cs">
-      <Link>Unit\DefaultNancyBootstrapperBootstrapperBaseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DynamicDictionaryValueFixture.cs">
-      <Link>Unit\DynamicDictionaryValueFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Extensions\StringExtensionsFixture.cs">
-      <Link>Unit\Extensions\StringExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeDefaultNancyBootstrapper.cs">
-      <Link>Fakes\FakeDefaultNancyBootstrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\HeadResponseFixture.cs">
-      <Link>Unit\HeadResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultBinderFixture.cs">
-      <Link>Unit\ModelBinding\DefaultBinderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultBodyDeserializers\JsonBodyDeserializerFixture.cs">
-      <Link>Unit\ModelBinding\DefaultBodyDeserializers\JsonBodyDeserializerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultBodyDeserializers\XmlBodyDeserializerfixture.cs">
-      <Link>Unit\ModelBinding\DefaultBodyDeserializers\XmlBodyDeserializerfixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultConverters\CollectionConverterFixture.cs">
-      <Link>Unit\ModelBinding\DefaultConverters\CollectionConverterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultConverters\FallbackConverterFixture.cs">
-      <Link>Unit\ModelBinding\DefaultConverters\FallbackConverterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultFieldNameConverterFixture.cs">
-      <Link>Unit\ModelBinding\DefaultFieldNameConverterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DynamicModelBinderAdapterFixture.cs">
-      <Link>Unit\ModelBinding\DynamicModelBinderAdapterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ModelBinding\DefaultModelBinderLocatorFixture.cs">
-      <Link>Unit\ModelBinding\DefaultModelBinderLocatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyCookieFixture.cs">
-      <Link>Unit\NancyCookieFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyEngineFixture.cs">
-      <Link>Unit\NancyEngineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyMiddlewareFixture.cs">
-      <Link>Unit\NancyMiddlewareFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyModuleFixture.cs">
-      <Link>Unit\NancyModuleFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\AfterPipelineFixture.cs">
-      <Link>Unit\AfterPipelineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\BeforePipelineFixture.cs">
-      <Link>Unit\BeforePipelineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ErrorPipelineFixture.cs">
-      <Link>Unit\ErrorPipelineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyOptionsExtensionsFixture.cs">
-      <Link>Unit\NancyOptionsExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\NancyOptionsFixture.cs">
-      <Link>Unit\NancyOptionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\RequestFixture.cs">
-      <Link>Unit\RequestFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeModuleCatalog.cs">
-      <Link>Fakes\FakeModuleCatalog.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DefaultResponseFormatterFixture.cs">
-      <Link>Unit\DefaultResponseFormatterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\RequestHeadersFixture.cs">
-      <Link>Unit\RequestHeadersFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ResponseExtensionsFixture.cs">
-      <Link>Unit\ResponseExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\DefaultJsonSerializerFixture.cs">
-      <Link>Unit\Responses\DefaultJsonSerializerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\EmbeddedFileResponseFixture.cs">
-      <Link>Unit\Responses\EmbeddedFileResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\Negotiation\MediaRangeFixture.cs">
-      <Link>Unit\Responses\Negotiation\MediaRangeFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\RedirectResponseFixture.cs">
-      <Link>Unit\Responses\RedirectResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\StreamResponseFixture.cs">
-      <Link>Unit\Responses\StreamResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\TextResponseFixture.cs">
-      <Link>Unit\Responses\TextResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\ConstraintNodeRouteResolverFixture.cs">
-      <Link>Unit\Routing\ConstraintNodeRouteResolverFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\ConstraintNodeRouteScoringFixture.cs">
-      <Link>Unit\Routing\ConstraintNodeRouteScoringFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\DefaultNancyModuleBuilderFixture.cs">
-      <Link>Unit\Routing\DefaultNancyModuleBuilderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\DefaultRequestDispatcherFixture.cs">
-      <Link>Unit\Routing\DefaultRequestDispatcherFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\DefaultRouteCacheProviderFixture.cs">
-      <Link>Unit\Routing\DefaultRouteCacheProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\DefaultRouteInvokerFixture.cs">
-      <Link>Unit\Routing\DefaultRouteInvokerFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRouteCache.cs">
-      <Link>Fakes\FakeRouteCache.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeNancyModule.cs">
-      <Link>Fakes\FakeNancyModule.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeRequest.cs">
-      <Link>Fakes\FakeRequest.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\DefaultRouteSegmentExtractorFixture.cs">
-      <Link>Unit\Routing\DefaultRouteSegmentExtractorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\NotFoundRouteFixture.cs">
-      <Link>Unit\Routing\NotFoundRouteFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ResponseFixture.cs">
-      <Link>Unit\ResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\RouteCacheFixture.cs">
-      <Link>Unit\Routing\RouteCacheFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\RouteDescriptionFixture.cs">
-      <Link>Unit\Routing\RouteDescriptionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\RouteFixture.cs">
-      <Link>Unit\Routing\RouteFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\DynamicDictionaryFixture.cs">
-      <Link>Unit\DynamicDictionaryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Routing\DefaultRouteResolverFixture.cs">
-      <Link>Unit\Routing\DefaultRouteResolverFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Security\CsrfFixture.cs">
-      <Link>Unit\Security\CsrfFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Security\DefaultCsrfTokenValidatorFixture.cs">
-      <Link>Unit\Security\DefaultCsrfTokenValidatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Security\ModuleSecurityFixture.cs">
-      <Link>Unit\Security\ModuleSecurityFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Security\SSLProxyFixture.cs">
-      <Link>Unit\Security\SSLProxyFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Security\ClaimsPrincipalExtensionsFixture.cs">
-      <Link>Unit\Security\ClaimsPrincipalExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Sessions\CookieBasedSessionsConfigurationFixture.cs">
-      <Link>Unit\Sessions\CookieBasedSessionsConfigurationFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Sessions\CookieBasedSessionsFixture.cs">
-      <Link>Unit\Sessions\CookieBasedSessionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Sessions\DefaultSessionObjectFormatterFixture.cs">
-      <Link>Unit\Sessions\DefaultSessionObjectFormatterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Sessions\NullSessionProviderFixture.cs">
-      <Link>Unit\Sessions\NullSessionProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Sessions\SessionFixture.cs">
-      <Link>Unit\Sessions\SessionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\TextFormatterFixture.cs">
-      <Link>Unit\TextFormatterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\StaticContentConventionBuilderFixture.cs">
-      <Link>Unit\StaticContentConventionBuilderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\UrlFixture.cs">
-      <Link>Unit\UrlFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Validation\CompositeValidatorFixture.cs">
-      <Link>Unit\Validation\CompositeValidatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Validation\ModuleExtensionsFixture.cs">
-      <Link>Unit\Validation\ModuleExtensionsFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Validation\ValidationResultFixture.cs">
-      <Link>Unit\Validation\ValidationResultFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Validation\DefaultValidatorLocatorFixture.cs">
-      <Link>Unit\Validation\DefaultValidatorLocatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\DefaultRenderContextFixture.cs">
-      <Link>Unit\ViewEngines\DefaultRenderContextFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Localization\ResourceBasedTextResourceFixture.cs">
-      <Link>Unit\Localization\ResourceBasedTextResourceFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Fakes\FakeViewEngine.cs">
-      <Link>Fakes\FakeViewEngine.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\FileSystemViewLocationProviderFixture.cs">
-      <Link>Unit\ViewEngines\FileSystemViewLocationProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\FileSystemViewLocationResultFixture.cs">
-      <Link>Unit\ViewEngines\FileSystemViewLocationResultFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\ResourceViewLocationProviderFixture.cs">
-      <Link>Unit\ViewEngines\ResourceViewLocationProviderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\ViewEngineStartupFixture.cs">
-      <Link>Unit\ViewEngines\ViewEngineStartupFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\DefaultViewFactoryFixture.cs">
-      <Link>Unit\ViewEngines\DefaultViewFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\DefaultViewLocatorFixture.cs">
-      <Link>Unit\ViewEngines\DefaultViewLocatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\DefaultViewResolverFixture.cs">
-      <Link>Unit\ViewEngines\DefaultViewResolverFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\SuperSimpleViewEngineTests.cs">
-      <Link>Unit\ViewEngines\SuperSimpleViewEngineTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\ViewEngines\ViewNotFoundExceptionFixture.cs">
-      <Link>Unit\ViewEngines\ViewNotFoundExceptionFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\XmlFormatterExtensionsFixtures.cs">
-      <Link>Unit\XmlFormatterExtensionsFixtures.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\RecordAsync.cs">
-      <Link>xUnitExtensions\RecordAsync.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\Skip.cs">
-      <Link>xUnitExtensions\Skip.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\SkipException.cs">
-      <Link>xUnitExtensions\SkipException.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\xUnitExtensions\SkippableFactAttribute.cs">
-      <Link>xUnitExtensions\SkippableFactAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\Responses\GenericFileResponseFixture.cs">
-      <Link>Unit\Responses\GenericFileResponseFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Tests\Unit\AppDomainAssemblyCatalogFixture.cs">
-      <Link>Unit\AppDomainAssemblyCatalogFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj">
-      <Project>{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}</Project>
-      <Name>Nancy.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.Tests\Resources\Link.Texts.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Link.Texts.Designer.cs</LastGenOutput>
-      <Link>Resources\Link.Texts.resx</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy.Tests\Resources\Menu.Texts.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Menu.Texts.Designer.cs</LastGenOutput>
-      <Link>Resources\Menu.Texts.resx</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy.Tests\Resources\Menu.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Menu.Designer.cs</LastGenOutput>
-      <Link>Resources\Menu.resx</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Nancy.Tests\Resources\Views\staticviewresource.html">
-      <Link>Resources\Views\staticviewresource.html</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\space in name.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\space in name.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\dotted.filename.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\dotted.filename.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\css\styles.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\css\styles.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\strange-css-filename.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\strange-css-filename.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\styles.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\styles.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\Sub.folder\styles.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\Sub.folder\styles.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\Assets\Styles\Sub\styles.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\Assets\Styles\Sub\styles.css</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\test.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\test.txt</Link>
-    </Content>
-    <Content Include="..\Nancy.Tests\Resources\zip.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>Resources\zip.png</Link>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/test/Nancy.Tests.MSBuild/packages.config b/test/Nancy.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Tests/Nancy.Tests.csproj b/test/Nancy.Tests/Nancy.Tests.csproj
new file mode 100644
index 0000000000..426fe4b85a
--- /dev/null
+++ b/test/Nancy.Tests/Nancy.Tests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Views\staticviewresource.html" Exclude="bin\**;obj\**;packages\**;@(EmbeddedResource)" />
+    <None Update="Resources\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2" />
+    <PackageReference Include="System.Data.Common" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Tests/Nancy.Tests.xproj b/test/Nancy.Tests/Nancy.Tests.xproj
deleted file mode 100644
index 5903750b7f..0000000000
--- a/test/Nancy.Tests/Nancy.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>3ba7d452-98e5-47b0-bd1e-dc348e13a72a</ProjectGuid>
-    <RootNamespace>Nancy.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Tests/Unit/HttpLinkRelationFixture.cs b/test/Nancy.Tests/Unit/HttpLinkRelationFixture.cs
index f0cd8cad1c..6ef5b182f7 100644
--- a/test/Nancy.Tests/Unit/HttpLinkRelationFixture.cs
+++ b/test/Nancy.Tests/Unit/HttpLinkRelationFixture.cs
@@ -180,6 +180,7 @@ public void Prefix_and_value_on_non_iana_relation_created_from_string()
             rel.Value.ShouldEqual("home");
         }
 
+        [Fact]
         public void Relation_should_be_equal_to_itself()
         {
             // Given
diff --git a/test/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs b/test/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs
index 50170d55b1..96b7ae3696 100644
--- a/test/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs
+++ b/test/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs
@@ -1,11 +1,9 @@
 namespace Nancy.Tests.Unit.Responses
 {
+    using System;
     using System.IO;
-
     using FakeItEasy;
-
     using Nancy.Responses;
-
     using Xunit;
 
     public class StreamResponseFixture
@@ -19,10 +17,10 @@ public void Should_copy_stream_to_output_when_body_invoked()
 
             var inputStream =
                 new MemoryStream(streamContent);
-            
-            var response = 
+
+            var response =
                 new StreamResponse(() => inputStream, "test");
-            
+
             var outputStream = new MemoryStream();
 
             // When
@@ -62,9 +60,7 @@ public void Should_throw_exception_when_stream_is_non_readable()
         {
             // Given
             var inputStream =
-                A.Fake<Stream>();
-
-            A.CallTo(() => inputStream.CanRead).Returns(false);
+                new TestStream(canRead: false);
 
             var response =
                 new StreamResponse(() => inputStream, "test");
@@ -77,5 +73,55 @@ public void Should_throw_exception_when_stream_is_non_readable()
             // Then
             exception.ShouldNotBeNull();
         }
+
+        public class TestStream : Stream
+        {
+            public TestStream(bool canRead = true, bool canWrite = true)
+            {
+                this.CanRead = canRead;
+                this.CanWrite = canWrite;
+            }
+
+            public override bool CanRead { get; }
+
+            public override bool CanSeek
+            {
+                get { return true; }
+            }
+
+            public override bool CanWrite  { get; }
+
+            public override long Length
+            {
+                get { return 0; }
+            }
+
+            public override long Position
+            {
+                get { return 0; }
+                set { }
+            }
+
+            public override void Flush()
+            {
+            }
+            public override int Read(byte[] buffer, int offset, int count)
+            {
+                return 0;
+            }
+
+            public override long Seek(long offset, SeekOrigin origin)
+            {
+                return 0;
+            }
+
+            public override void SetLength(long value)
+            {
+            }
+
+            public override void Write(byte[] buffer, int offset, int count)
+            {
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs b/test/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs
index c8232e774c..f119d37974 100644
--- a/test/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs
+++ b/test/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs
@@ -1,20 +1,19 @@
 namespace Nancy.Tests.Unit.Sessions
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using System.Reflection;
+    using System.Text;
     using System.Threading;
-
     using FakeItEasy;
-
     using Nancy.Bootstrapper;
     using Nancy.Cryptography;
     using Nancy.Helpers;
     using Nancy.IO;
     using Nancy.Session;
     using Nancy.Tests.Fakes;
-
     using Xunit;
 
     public class CookieBasedSessionsFixture
@@ -123,18 +122,18 @@ public void Should_load_an_empty_session_if_no_session_cookie_exists()
         [Fact]
         public void Should_load_an_empty_session_if_session_cookie_is_invalid()
         {
-          //given
-          var inputValue = ValidHmac.Substring(0, 5); //invalid Hmac
-          inputValue = HttpUtility.UrlEncode(inputValue);
-          var store = new CookieBasedSessions(this.aesEncryptionProvider, this.defaultHmacProvider, this.defaultObjectSerializer);
-          var request = new Request("GET", "/", "http");
-          request.Cookies.Add(store.CookieName, inputValue);
+            //given
+            var inputValue = ValidHmac.Substring(0, 5); //invalid Hmac
+            inputValue = HttpUtility.UrlEncode(inputValue);
+            var store = new CookieBasedSessions(this.aesEncryptionProvider, this.defaultHmacProvider, this.defaultObjectSerializer);
+            var request = new Request("GET", "/", "http");
+            request.Cookies.Add(store.CookieName, inputValue);
 
-          //when
-          var result = store.Load(request);
+            //when
+            var result = store.Load(request);
 
-          //then
-          result.Count.ShouldEqual(0);
+            //then
+            result.Count.ShouldEqual(0);
         }
 
         [Fact]
@@ -346,14 +345,29 @@ public void Should_generate_hmac()
         [Fact]
         public void Should_load_valid_test_data()
         {
-            var inputValue = ValidHmac + ValidData;
-            inputValue = HttpUtility.UrlEncode(inputValue);
-            var store = new CookieBasedSessions(this.aesEncryptionProvider, this.defaultHmacProvider, this.defaultObjectSerializer);
-            var request = new Request("GET", "/", "http");
-            request.Cookies.Add(store.CookieName, inputValue);
+            // Given
+            var payload = new DefaultSessionObjectFormatterFixture.Payload
+            {
+                BoolValue = true
+            };
+
+            var cookieData = GenerateCookieData(new Dictionary<string, object>
+            {
+                { "key1", payload }
+            });
 
+            var store =
+                new CookieBasedSessions(this.aesEncryptionProvider, this.defaultHmacProvider, this.defaultObjectSerializer);
+
+            var request =
+                new Request("GET", "/", "http");
+
+            request.Cookies.Add(store.CookieName, cookieData.ToString());
+
+            // When
             var result = store.Load(request);
 
+            // Then
             result.Count.ShouldEqual(1);
             result.First().Value.ShouldBeOfType(typeof(DefaultSessionObjectFormatterFixture.Payload));
         }
@@ -492,13 +506,61 @@ public void Should_set_Path_when_config_provides_path_value()
             cookie.Path.ShouldEqual(storeConfig.Path);
         }
 
+        private class CookieData
+        {
+            public string Data { get; set; }
+
+            public string Hmac { get; set; }
+
+            public override string ToString()
+            {
+                return HttpUtility.UrlEncode(string.Concat(this.Hmac, this.Data));
+            }
+        }
+
+        private CookieData GenerateCookieData(string key, object data)
+        {
+            return this.GenerateCookieData(new Dictionary<string, object>
+            {
+                { key, data }
+            });
+        }
+
+        private CookieData GenerateCookieData(IDictionary<string, object> data)
+        {
+            var sb = new StringBuilder();
+
+            foreach (var key in data.Keys)
+            {
+                sb.Append(HttpUtility.UrlEncode(key));
+                sb.Append("=");
+
+                var objectString = this.defaultObjectSerializer.Serialize(data[key]);
+
+                sb.Append(HttpUtility.UrlEncode(objectString));
+                sb.Append(";");
+            }
+
+            var encryptedData =
+                this.aesEncryptionProvider.Encrypt(sb.ToString());
+
+            var hmacBytes =
+                this.defaultHmacProvider.GenerateHmac(encryptedData);
+
+            return new CookieData
+            {
+                Data = encryptedData,
+                Hmac = Convert.ToBase64String(hmacBytes)
+            };
+        }
+
         private Request CreateRequest(string sessionValue, bool load = true)
         {
             var headers = new Dictionary<string, IEnumerable<string>>(1);
 
             if (!string.IsNullOrEmpty(sessionValue))
             {
-                headers.Add("cookie", new[] { this.cookieStore.CookieName+ "=" + HttpUtility.UrlEncode(sessionValue) });
+                headers.Add("cookie", new[] { this.cookieStore.CookieName + "=" + HttpUtility.UrlEncode(sessionValue) });
             }
 
             var request = new Request("GET", new Url { Path = "/", Scheme = "http", Port = 9001, BasePath = "goku.power" }, CreateRequestStream(), headers);
@@ -521,4 +583,4 @@ private static RequestStream CreateRequestStream(Stream stream)
             return RequestStream.FromStream(stream, 0, 1, true);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs b/test/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs
index b7f9b409fb..cc3a8661a5 100644
--- a/test/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs
+++ b/test/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs
@@ -25,12 +25,10 @@ public class StaticContentConventionBuilderFixture
 
         public StaticContentConventionBuilderFixture()
         {
-            // Under .NET Framework, resources are copied to
-            // bin\Release\net452\win7-x64\Resources (modulo version and architecture), but under .NET Core, they go to
-            // bin\Release\netcoreapp1.0\Resources.
-            // Set our working directory relative the assembly to ensure the tests find the resources.
-            this.directory = new DirectoryInfo(typeof(StaticContentConventionBuilderFixture).GetAssembly().Location)
-                .Parent.FullName;
+            var assembly = typeof(StaticContentConventionBuilderFixture).GetAssembly();
+            var localPath = new Uri(assembly.CodeBase).LocalPath;
+            this.directory = new DirectoryInfo(localPath).Parent.FullName;
+
             this.environment = new DefaultNancyEnvironment();
             this.environment.StaticContent(safepaths:this.directory);
         }
@@ -316,4 +314,4 @@ private static Func<NancyContext, string, Response> GetResolver(string virtualDi
             return StaticContentConventionBuilder.AddDirectory(virtualDirectory, "Resources/Assets/Styles");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Nancy.Tests/project.json b/test/Nancy.Tests/project.json
deleted file mode 100644
index d813e4643c..0000000000
--- a/test/Nancy.Tests/project.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "version": "1.4.1.0",
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Testing": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "copyToOutput": [
-            "Resources/**/*"
-        ],
-        "embed": [
-            "Resources/views/staticviewresource.html"
-        ]
-    },
-
-    "configurations" : {
-        "MonoRelease": {
-             "buildOptions": {
-                "define": ["MONO"],
-                "optimize": true
-              }
-        }
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" },
-                "System.Web": { "type": "build" }
-            },
-            "dependencies": {
-                "Microsoft.CodeAnalysis.CSharp": "1.3.2"
-            }
-        },
-        "netcoreapp1.0": {
-            "buildOptions": {
-                "define": [ "CORE" ]
-            },
-            "dependencies": {
-                "Microsoft.CodeAnalysis.CSharp": "2.0.0-rc",
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests.MSBuild/Nancy.Validation.DataAnnotations.Tests.csproj b/test/Nancy.Validation.DataAnnotatioins.Tests.MSBuild/Nancy.Validation.DataAnnotations.Tests.csproj
deleted file mode 100644
index 276990cc12..0000000000
--- a/test/Nancy.Validation.DataAnnotatioins.Tests.MSBuild/Nancy.Validation.DataAnnotations.Tests.csproj
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8F9F910D-416E-4B28-BE59-D76670405F56}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Validation.DataAnnotations.Tests</RootNamespace>
-    <AssemblyName>Nancy.Validation.DataAnnotations.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Validation.DataAnnotatioins.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Validation.DataAnnotatioins.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotatioins.Tests\DataAnnotationsValidatorFixture.cs">
-      <Link>DataAnnotationsValidatorFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotatioins.Tests\DataAnnotationsValidatorFactoryFixture.cs">
-      <Link>DataAnnotationsValidatorFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotatioins.Tests\DefaultValidatableObjectAdapterFixture.cs">
-      <Link>DefaultValidatableObjectAdapterFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.DataAnnotatioins.Tests\PropertyValidatorFixture.cs">
-      <Link>PropertyValidatorFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Validation.DataAnnotations.MSBuild\Nancy.Validation.DataAnnotations.csproj">
-      <Project>{701765DC-F4F2-4943-A37F-6ED253198158}</Project>
-      <Name>Nancy.Validation.DataAnnotations</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests.MSBuild/packages.config b/test/Nancy.Validation.DataAnnotatioins.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.Validation.DataAnnotatioins.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/Nancy.Validation.DataAnnotatioins.Tests.xproj b/test/Nancy.Validation.DataAnnotatioins.Tests/Nancy.Validation.DataAnnotatioins.Tests.xproj
deleted file mode 100644
index 775fe2bf93..0000000000
--- a/test/Nancy.Validation.DataAnnotatioins.Tests/Nancy.Validation.DataAnnotatioins.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>8830dbe0-2162-4f35-8d81-1577f17abb10</ProjectGuid>
-    <RootNamespace>Nancy.Validation.DataAnnotatioins.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Validation.DataAnnotatioins.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/project.json b/test/Nancy.Validation.DataAnnotatioins.Tests/project.json
deleted file mode 100644
index 4acf85d473..0000000000
--- a/test/Nancy.Validation.DataAnnotatioins.Tests/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Validation.DataAnnotations": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.ComponentModel.Annotations": { "type": "build" },
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFactoryFixture.cs b/test/Nancy.Validation.DataAnnotations.Tests/DataAnnotationsValidatorFactoryFixture.cs
similarity index 100%
rename from test/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFactoryFixture.cs
rename to test/Nancy.Validation.DataAnnotations.Tests/DataAnnotationsValidatorFactoryFixture.cs
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFixture.cs b/test/Nancy.Validation.DataAnnotations.Tests/DataAnnotationsValidatorFixture.cs
similarity index 100%
rename from test/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFixture.cs
rename to test/Nancy.Validation.DataAnnotations.Tests/DataAnnotationsValidatorFixture.cs
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/DefaultValidatableObjectAdapterFixture.cs b/test/Nancy.Validation.DataAnnotations.Tests/DefaultValidatableObjectAdapterFixture.cs
similarity index 100%
rename from test/Nancy.Validation.DataAnnotatioins.Tests/DefaultValidatableObjectAdapterFixture.cs
rename to test/Nancy.Validation.DataAnnotations.Tests/DefaultValidatableObjectAdapterFixture.cs
diff --git a/test/Nancy.Validation.DataAnnotations.Tests/Nancy.Validation.DataAnnotations.Tests.csproj b/test/Nancy.Validation.DataAnnotations.Tests/Nancy.Validation.DataAnnotations.Tests.csproj
new file mode 100644
index 0000000000..5263110a18
--- /dev/null
+++ b/test/Nancy.Validation.DataAnnotations.Tests/Nancy.Validation.DataAnnotations.Tests.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/PropertyValidatorFixture.cs b/test/Nancy.Validation.DataAnnotations.Tests/PropertyValidatorFixture.cs
similarity index 100%
rename from test/Nancy.Validation.DataAnnotatioins.Tests/PropertyValidatorFixture.cs
rename to test/Nancy.Validation.DataAnnotations.Tests/PropertyValidatorFixture.cs
diff --git a/test/Nancy.Validation.FluentValidation.Tests.MSBuild/Nancy.Validation.FluentValidation.Tests.csproj b/test/Nancy.Validation.FluentValidation.Tests.MSBuild/Nancy.Validation.FluentValidation.Tests.csproj
deleted file mode 100644
index f04cdaeb82..0000000000
--- a/test/Nancy.Validation.FluentValidation.Tests.MSBuild/Nancy.Validation.FluentValidation.Tests.csproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FBC35268-377B-4DBE-87E3-B22D1314BEC6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.Validation.FluentValidation.Tests</RootNamespace>
-    <AssemblyName>Nancy.Validation.FluentValidation.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.Validation.FluentValidation.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.Validation.FluentValidation.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=6.3.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.6.3.4-alpha\lib\Net45\FluentValidation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation.Tests\DefaultFluentAdapterFactoryFixture.cs">
-      <Link>DefaultFluentAdapterFactoryFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.Validation.FluentValidation.Tests\FluentValidationValidatorFactoryFixture.cs">
-      <Link>FluentValidationValidatorFactoryFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Validation.FluentValidation.MSBuild\Nancy.Validation.FluentValidation.csproj">
-      <Project>{01230f2a-d108-480c-b834-8ce0569fd3b3}</Project>
-      <Name>Nancy.Validation.FluentValidation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0dca-4b0f-a0dc-9075e75a676f}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.Validation.FluentValidation.Tests.MSBuild/packages.config b/test/Nancy.Validation.FluentValidation.Tests.MSBuild/packages.config
deleted file mode 100644
index cd547bf532..0000000000
--- a/test/Nancy.Validation.FluentValidation.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="FluentValidation" version="6.3.4-alpha" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.csproj b/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.csproj
new file mode 100644
index 0000000000..598e62356b
--- /dev/null
+++ b/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.xproj b/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.xproj
deleted file mode 100644
index 9092398412..0000000000
--- a/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>8dd96d02-c6d3-435b-b0f7-2460161a250f</ProjectGuid>
-    <RootNamespace>Nancy.Validation.FluentValidation.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.Validation.FluentValidation.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.Validation.FluentValidation.Tests/project.json b/test/Nancy.Validation.FluentValidation.Tests/project.json
deleted file mode 100644
index a2baa643e7..0000000000
--- a/test/Nancy.Validation.FluentValidation.Tests/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "FluentValidation": "6.3.4-alpha",
-        "Nancy": { "target": "project" },
-        "Nancy.Validation.FluentValidation": { "target": "project" },
-        "xunit": "2.2.0",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0"
-                }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests.MSBuild/Nancy.ViewEngines.DotLiquid.Tests.csproj b/test/Nancy.ViewEngines.DotLiquid.Tests.MSBuild/Nancy.ViewEngines.DotLiquid.Tests.csproj
deleted file mode 100644
index 0e49094fce..0000000000
--- a/test/Nancy.ViewEngines.DotLiquid.Tests.MSBuild/Nancy.ViewEngines.DotLiquid.Tests.csproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.DotLiquid.Tests</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.DotLiquid.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.DotLiquid.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.DotLiquid.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="DotLiquid, Version=2.0.64.0, Culture=neutral, PublicKeyToken=82e46016ecf9f07c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DotLiquid.2.0.64\lib\net451\DotLiquid.dll</HintPath>
-    </Reference>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid.Tests\DotLiquidViewEngineFixture.cs">
-      <Link>DotLiquidViewEngineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid.Tests\DynamicDropFixture.cs">
-      <Link>DynamicDropFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid.Tests\FakeModel.cs">
-      <Link>FakeModel.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid.Tests\Functional\PartialRenderingFixture.cs">
-      <Link>Functional\PartialRenderingFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid.Tests\LiquidNancyFileSystemFixture.cs">
-      <Link>LiquidNancyFileSystemFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.DotLiquid.Tests\Properties\AssemblyInfo.cs">
-      <Link>Properties\AssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj">
-      <Project>{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}</Project>
-      <Name>Nancy.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.ViewEngines.DotLiquid.MSBuild\Nancy.ViewEngines.DotLiquid.csproj">
-      <Project>{B795886D-9D70-45B1-BFB5-AD54CBC9A447}</Project>
-      <Name>Nancy.ViewEngines.DotLiquid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="..\Nancy.ViewEngines.DotLiquid.Tests\Views\singlequotedpartial.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\singlequotedpartial.liquid</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.DotLiquid.Tests\Views\doublequotedpartial.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\doublequotedpartial.liquid</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.DotLiquid.Tests\Views\unquotedpartial.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Views\unquotedpartial.liquid</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.DotLiquid.Tests\Views\partial.liquid">
-      <Link>Views\partial.liquid</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests.MSBuild/packages.config b/test/Nancy.ViewEngines.DotLiquid.Tests.MSBuild/packages.config
deleted file mode 100644
index 98c3d52bd8..0000000000
--- a/test/Nancy.ViewEngines.DotLiquid.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DotLiquid" version="2.0.64" targetFramework="net452" />
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.csproj b/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.csproj
new file mode 100644
index 0000000000..7d35ef15ae
--- /dev/null
+++ b/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="Views\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DotLiquid" Version="2.0.64" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.xproj b/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.xproj
deleted file mode 100644
index b578c4bf66..0000000000
--- a/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>91f4ea23-788b-4e54-a38e-fe738b3bf2f1</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.DotLiquid.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.DotLiquid.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests/project.json b/test/Nancy.ViewEngines.DotLiquid.Tests/project.json
deleted file mode 100644
index 7c39ef1556..0000000000
--- a/test/Nancy.ViewEngines.DotLiquid.Tests/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "dependencies": {
-        "DotLiquid": "2.0.64",
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Testing": { "target": "project" },
-        "Nancy.ViewEngines.DotLiquid": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ],
-        "copyToOutput": [
-            "Views/**/*"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" },
-                "System.Threading.Tasks": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.ViewEngines.Markdown.Tests.MSBuild/Nancy.ViewEngines.Markdown.Tests.csproj b/test/Nancy.ViewEngines.Markdown.Tests.MSBuild/Nancy.ViewEngines.Markdown.Tests.csproj
deleted file mode 100644
index e2153c12d2..0000000000
--- a/test/Nancy.ViewEngines.Markdown.Tests.MSBuild/Nancy.ViewEngines.Markdown.Tests.csproj
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8EE6F976-F11F-44B3-B065-F5AAA598B30D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Markdown.Tests</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Markdown.Tests</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDevelop|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDevelop\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MarkdownSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Markdown.Tests\MarkdownViewEngineFixture.cs">
-      <Link>MarkdownViewEngineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Markdown.Tests\MarkdownViewengineRenderFixture.cs">
-      <Link>MarkdownViewengineRenderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Markdown.Tests\UserModel.cs">
-      <Link>UserModel.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Nancy.ViewEngines.Markdown.Tests\Markdown\standalone.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Markdown\standalone.md</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Markdown.Tests\Markdown\home.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Markdown\home.md</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Markdown.Tests\Markdown\master.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Markdown\master.md</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Markdown.Tests\Markdown\partial.markdown">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Markdown\partial.markdown</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Markdown.Tests\Markdown\viewwithhtmlmaster.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Markdown\viewwithhtmlmaster.md</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.ViewEngines.Markdown.MSBuild\Nancy.ViewEngines.Markdown.csproj">
-      <Project>{864AF449-0902-44FC-BEEE-06BA9A6F4A8F}</Project>
-      <Name>Nancy.ViewEngines.Markdown</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Nancy.ViewEngines.Markdown.Tests\Markdown\htmlmaster.html">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>Markdown\htmlmaster.html</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Markdown.Tests.MSBuild/packages.config b/test/Nancy.ViewEngines.Markdown.Tests.MSBuild/packages.config
deleted file mode 100644
index ea783c8ede..0000000000
--- a/test/Nancy.ViewEngines.Markdown.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="MarkdownSharp" version="1.13.0.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.csproj b/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.csproj
new file mode 100644
index 0000000000..c9eabdf773
--- /dev/null
+++ b/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="Markdown\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MarkdownSharp" Version="1.13.0" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.xproj b/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.xproj
deleted file mode 100644
index 84502b98fd..0000000000
--- a/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>c46bfaa7-f471-45a6-a5ac-fcf9390408ee</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Markdown.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Markdown.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.ViewEngines.Markdown.Tests/project.json b/test/Nancy.ViewEngines.Markdown.Tests/project.json
deleted file mode 100644
index 144bea886d..0000000000
--- a/test/Nancy.ViewEngines.Markdown.Tests/project.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "MarkdownSharp": "1.13.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.ViewEngines.Markdown": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ],
-        "copyToOutput": [
-            "Markdown/**/*"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.ViewEngines.Razor.Tests.MSBuild/Nancy.ViewEngines.Razor.Tests.csproj b/test/Nancy.ViewEngines.Razor.Tests.MSBuild/Nancy.ViewEngines.Razor.Tests.csproj
deleted file mode 100644
index da3035f1e5..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests.MSBuild/Nancy.ViewEngines.Razor.Tests.csproj
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FE32460D-547C-4EB9-A768-541255CCAA83}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Razor.Tests</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Razor.Tests</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>True</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Razor.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>False</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>True</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Razor.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.Tests\GreetingViewBase.cs">
-      <Link>GreetingViewBase.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.Tests\RazorViewEngineFixture.cs">
-      <Link>RazorViewEngineFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.Tests\TestModel.cs">
-      <Link>TestModel.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.Tests\TextResourceFinderFixture.cs">
-      <Link>TextResourceFinderFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Nancy.ViewEngines.Razor.Tests.Models.MSBuild\Nancy.ViewEngines.Razor.Tests.Models.csproj">
-      <Project>{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}</Project>
-      <Name>Nancy.ViewEngines.Razor.Tests.Models</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.ViewEngines.Razor.MSBuild\Nancy.ViewEngines.Razor.csproj">
-      <Project>{2C6F51DF-015C-4DB6-B44C-0E5E4F25E2A9}</Project>
-      <Name>Nancy.ViewEngines.Razor</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesAttributeWithRawHtmlStringInside.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesAttributeWithRawHtmlStringInside.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesHelper.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesHelper.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesAttributeWithCodeInside.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesAttributeWithCodeInside.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesAttributeWithDynamicNullInside.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesAttributeWithDynamicNullInside.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesAttributeWithHtmlStringInside.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesAttributeWithHtmlStringInside.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesAttributeWithNonEncodedHtmlStringInside.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesAttributeWithNonEncodedHtmlStringInside.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesModelVB.vbhtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesModelVB.vbhtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesModelCSharp.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesModelCSharp.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\Layouts\LayoutWithManySections.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Layouts\LayoutWithManySections.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\Layouts\LayoutWithOptionalSection.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Layouts\LayoutWithOptionalSection.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\Layouts\LayoutWithOptionalSectionWithDefaults.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Layouts\LayoutWithOptionalSectionWithDefaults.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\Layouts\LayoutWithSection.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Layouts\LayoutWithSection.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\Layouts\SimplyLayout.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Layouts\SimplyLayout.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayout.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayout.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayoutAndManySection.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayoutAndManySection.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayoutAndModel.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayoutAndModel.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayoutAndOptionalSection.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayoutAndOptionalSection.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayoutAndOptionalSectionOverridingDefaults.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayoutAndOptionalSectionOverridingDefaults.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayoutAndOptionalSectionWithDefaults.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayoutAndOptionalSectionWithDefaults.cshtml</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Razor.Tests\TestViews\ViewThatUsesLayoutAndSection.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\ViewThatUsesLayoutAndSection.cshtml</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Razor.Tests.MSBuild/packages.config b/test/Nancy.ViewEngines.Razor.Tests.MSBuild/packages.config
deleted file mode 100644
index 60b866375b..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Razor.Tests.Models.MSBuild/Nancy.ViewEngines.Razor.Tests.Models.csproj b/test/Nancy.ViewEngines.Razor.Tests.Models.MSBuild/Nancy.ViewEngines.Razor.Tests.Models.csproj
deleted file mode 100644
index e0de5808b5..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests.Models.MSBuild/Nancy.ViewEngines.Razor.Tests.Models.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Razor.Tests.Models</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Razor.Tests.Models</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Razor.Tests.Models.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Razor.Tests.Models.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.Tests.Models\Hobby.cs">
-      <Link>Hobby.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Razor.Tests.Models\Person.cs">
-      <Link>Person.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Razor.Tests.Models.MSBuild/packages.config b/test/Nancy.ViewEngines.Razor.Tests.Models.MSBuild/packages.config
deleted file mode 100644
index 7f4f638a6e..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests.Models.MSBuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj b/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj
new file mode 100644
index 0000000000..0cde96dd4b
--- /dev/null
+++ b/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+</Project>
diff --git a/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.xproj b/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.xproj
deleted file mode 100644
index 050a10e24f..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>31fa18d3-24ad-4ab0-b297-5a2fd871989e</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Razor.Tests.Models</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Razor.Tests.Models</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.ViewEngines.Razor.Tests.Models/project.json b/test/Nancy.ViewEngines.Razor.Tests.Models/project.json
deleted file mode 100644
index f8d1e23145..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests.Models/project.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "frameworks": {
-        "net452": { }
-    }
-}
diff --git a/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.csproj b/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.csproj
new file mode 100644
index 0000000000..d8899cb1ed
--- /dev/null
+++ b/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="TestViews\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj" />
+    <ProjectReference Include="../Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.xproj b/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.xproj
deleted file mode 100644
index 1c1096a7e4..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.xproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a24271fa-e058-42e0-bb7d-3c8c43df4b04</ProjectGuid>
-    <RootNamespace>Nancy.ViewEngines.Razor.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AssemblyName>Nancy.ViewEngines.Razor.Tests</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/test/Nancy.ViewEngines.Razor.Tests/project.json b/test/Nancy.ViewEngines.Razor.Tests/project.json
deleted file mode 100644
index ce070d1c6e..0000000000
--- a/test/Nancy.ViewEngines.Razor.Tests/project.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "FakeItEasy": "3.0.0",
-        "FakeItEasy.Analyzer": "3.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "Nancy": { "target": "project" },
-        "Nancy.Testing": { "target": "project" },
-        "Nancy.ViewEngines.Razor": { "target": "project" },
-        "Nancy.ViewEngines.Razor.Tests.Models": { "target": "project" },
-        "xunit": "2.2.0"
-    },
-
-    "buildOptions": {
-        "compile": [
-            "../Nancy.Tests/ShouldExtensions.cs"
-        ],
-        "copyToOutput": [
-            "TestViews/**/*"
-        ]
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Runtime": { "type": "build" }
-            }
-        }
-    },
-
-    "testRunner": "xunit"
-}
diff --git a/test/Nancy.ViewEngines.Spark.Tests.MSBuild/Nancy.ViewEngines.Spark.Tests.csproj b/test/Nancy.ViewEngines.Spark.Tests.MSBuild/Nancy.ViewEngines.Spark.Tests.csproj
deleted file mode 100644
index 0ef391a364..0000000000
--- a/test/Nancy.ViewEngines.Spark.Tests.MSBuild/Nancy.ViewEngines.Spark.Tests.csproj
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{06F89662-C2F0-4C1D-8581-E0C4A615B7E2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nancy.ViewEngines.Spark.Tests</RootNamespace>
-    <AssemblyName>Nancy.ViewEngines.Spark.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\MonoDebug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Nancy.ViewEngines.Spark.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
-    <OutputPath>bin\MonoRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Nancy.ViewEngines.Spark.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FakeItEasy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FakeItEasy.2.0.0\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Spark, Version=1.7.0.0, Culture=neutral, PublicKeyToken=7f8549eed921a12c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Spark.1.7.0.0\lib\NET40\Spark.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Nancy.Tests\ShouldExtensions.cs">
-      <Link>ShouldExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark.Tests\NancyViewFolderFixture.cs">
-      <Link>NancyViewFolderFixture.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark.Tests\ViewModels\FakeViewModel.cs">
-      <Link>ViewModels\FakeViewModel.cs</Link>
-    </Compile>
-    <Compile Include="..\Nancy.ViewEngines.Spark.Tests\SparkViewEngineFixture.cs">
-      <Link>SparkViewEngineFixture.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Nancy.ViewEngines.Spark.MSBuild\Nancy.ViewEngines.Spark.csproj">
-      <Project>{4B7E35DF-1569-4346-B180-A09615723095}</Project>
-      <Name>Nancy.ViewEngines.Spark</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Nancy.MSBuild\Nancy.csproj">
-      <Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
-      <Name>Nancy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\App.config">
-      <Link>App.config</Link>
-    </None>
-    <None Include="packages.config" />
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeCodeMayBeDashOrAtBraced.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeCodeMayBeDashOrAtBraced.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeElementsMayStackOnOneLine.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeElementsMayStackOnOneLine.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeEvaluatesExpressions.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeEvaluatesExpressions.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeFileRenders.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeFileRenders.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeSupportsAttributesAndMayTreatSomeElementsAsSpecialNodes.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeSupportsAttributesAndMayTreatSomeElementsAsSpecialNodes.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeTextMayContainExpressions.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeTextMayContainExpressions.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Features\ShadeThatUsesApplicationLayout.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Features\ShadeThatUsesApplicationLayout.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Shared\_SimpleValue.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Shared\_SimpleValue.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Layouts\anotherLayout.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Layouts\anotherLayout.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\ShadeViews\Shared\Application.shade">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>ShadeViews\Shared\Application.shade</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Shared\Application.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Shared\Application.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Shared\elementLayout.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Shared\elementLayout.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Shared\layout.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Shared\layout.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Shared\Partial.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Shared\Partial.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesTildeSubstitutionWithSparkReplace.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesTildeSubstitutionWithSparkReplace.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesViewDataForViewBag.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesViewDataForViewBag.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\Subfolder\Subfolderview.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\Subfolder\Subfolderview.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesNullHtmlEncoding.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesNullHtmlEncoding.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesTildeSubstitution.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesTildeSubstitution.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatExpectsALayout.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatExpectsALayout.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesAllNamedContentAreas.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesAllNamedContentAreas.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesApplicationLayout.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesApplicationLayout.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\Index.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\Index.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\List.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\List.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\PartialTarget.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\PartialTarget.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatChangesGlobalSettings.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatChangesGlobalSettings.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatRendersPartialsThatShareState.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatRendersPartialsThatShareState.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesAnonymousViewModel.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesAnonymousViewModel.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesANullViewModel.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesANullViewModel.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesForeach.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesForeach.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesFormatting.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesFormatting.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesHtmlEncoding.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesHtmlEncoding.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesNamespaces.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesNamespaces.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesPartial.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesPartial.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesPartialImplicitly.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesPartialImplicitly.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\ViewThatUsesViewModel.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\ViewThatUsesViewModel.spark</Link>
-    </None>
-    <None Include="..\Nancy.ViewEngines.Spark.Tests\TestViews\Stub\_Row.spark">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>TestViews\Stub\_Row.spark</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\FakeItEasy.Analyzer.2.1.0\analyzers\dotnet\cs\FakeItEasy.Analyzer.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Spark.Tests.MSBuild/packages.config b/test/Nancy.ViewEngines.Spark.Tests.MSBuild/packages.config
deleted file mode 100644
index 3ecb0a67d3..0000000000
--- a/test/Nancy.ViewEngines.Spark.Tests.MSBuild/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FakeItEasy" version="2.0.0" targetFramework="net45" />
-  <package id="FakeItEasy.Analyzer" version="2.1.0" targetFramework="net45" />
-  <package id="Spark" version="1.7.0.0" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/test/Nancy.ViewEngines.Spark.Tests/Nancy.ViewEngines.Spark.Tests.csproj b/test/Nancy.ViewEngines.Spark.Tests/Nancy.ViewEngines.Spark.Tests.csproj
new file mode 100644
index 0000000000..2f1641e36c
--- /dev/null
+++ b/test/Nancy.ViewEngines.Spark.Tests/Nancy.ViewEngines.Spark.Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="ShadeViews\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="TestViews\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>