diff --git a/FSharp.Data.GraphQL.Build.sln b/FSharp.Data.GraphQL.Build.sln
deleted file mode 100644
index 31c5c9fea..000000000
--- a/FSharp.Data.GraphQL.Build.sln
+++ /dev/null
@@ -1,97 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32811.315
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Directory.Build.targets = Directory.Build.targets
-		global.json = global.json
-		LICENSE.txt = LICENSE.txt
-		Packages.props = Packages.props
-		Prepare template project for packing.ps1 = Prepare template project for packing.ps1
-		README.md = README.md
-		RELEASE_NOTES.md = RELEASE_NOTES.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{313AC7F5-4282-4779-8FEF-1536B4145860}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\publish_ci.yml = .github\workflows\publish_ci.yml
-		.github\workflows\publish_release.yml = .github\workflows\publish_release.yml
-		.github\workflows\pull_request.yml = .github\workflows\pull_request.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{56640EAF-82A6-4439-AD14-69F44A90DA99}"
-	ProjectSection(SolutionItems) = preProject
-		docs\files\introspection_query.graphql = docs\files\introspection_query.graphql
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601D-4D53-808B-36661911EDD1}"
-	ProjectSection(SolutionItems) = preProject
-		docs\files\img\logo-template.pdn = docs\files\img\logo-template.pdn
-		docs\files\img\logo.png = docs\files\img\logo.png
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
-	ProjectSection(SolutionItems) = preProject
-		build.cmd = build.cmd
-		build.sh = build.sh
-		README.md = README.md
-		RELEASE_NOTES.md = RELEASE_NOTES.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175-43B1-4C90-A1EE-8E351C33435D}"
-	ProjectSection(SolutionItems) = preProject
-		docs\tools\generate.fsx = docs\tools\generate.fsx
-		docs\tools\templates\template.cshtml = docs\tools\templates\template.cshtml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D5255-776D-4B61-85F9-73C37AA1FB9A}"
-	ProjectSection(SolutionItems) = preProject
-		docs\content\execution-pipeline.md = docs\content\execution-pipeline.md
-		docs\content\index.md = docs\content\index.md
-		docs\content\linq.md = docs\content\linq.md
-		docs\content\type-system.md = docs\content\type-system.md
-	EndProjectSection
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Debug|x64.Build.0 = Debug|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Debug|x86.Build.0 = Debug|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Release|x64.ActiveCfg = Release|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Release|x64.Build.0 = Release|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Release|x86.ActiveCfg = Release|Any CPU
-		{B05A0575-36CC-4FF0-8795-E5AA9120BAAF}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{56640EAF-82A6-4439-AD14-69F44A90DA99} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
-		{78D10788-601D-4D53-808B-36661911EDD1} = {56640EAF-82A6-4439-AD14-69F44A90DA99}
-		{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
-		{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}
-	EndGlobalSection
-EndGlobal
diff --git a/FSharp.Data.GraphQL.Build.slnx b/FSharp.Data.GraphQL.Build.slnx
new file mode 100644
index 000000000..a3a0fb84b
--- /dev/null
+++ b/FSharp.Data.GraphQL.Build.slnx
@@ -0,0 +1,47 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/docs/" />
+  <Folder Name="/docs/content/">
+    <File Path="docs/content/execution-pipeline.md" />
+    <File Path="docs/content/index.md" />
+    <File Path="docs/content/linq.md" />
+    <File Path="docs/content/type-system.md" />
+  </Folder>
+  <Folder Name="/docs/files/">
+    <File Path="docs/files/introspection_query.graphql" />
+  </Folder>
+  <Folder Name="/docs/files/img/">
+    <File Path="docs/files/img/logo-template.pdn" />
+    <File Path="docs/files/img/logo.png" />
+  </Folder>
+  <Folder Name="/docs/tools/">
+    <File Path="docs/tools/generate.fsx" />
+    <File Path="docs/tools/templates/template.cshtml" />
+  </Folder>
+  <Folder Name="/GitHub/">
+    <File Path=".github/workflows/publish_ci.yml" />
+    <File Path=".github/workflows/publish_release.yml" />
+    <File Path=".github/workflows/pull_request.yml" />
+  </Folder>
+  <Folder Name="/project/">
+    <File Path="build.cmd" />
+    <File Path="build.sh" />
+    <File Path="README.md" />
+    <File Path="RELEASE_NOTES.md" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="Directory.Build.targets" />
+    <File Path="global.json" />
+    <File Path="LICENSE.txt" />
+    <File Path="Packages.props" />
+    <File Path="Prepare template project for packing.ps1" />
+    <File Path="README.md" />
+    <File Path="RELEASE_NOTES.md" />
+  </Folder>
+  <Project Path="build/Build.fsproj" />
+</Solution>
diff --git a/FSharp.Data.GraphQL.Integration.sln b/FSharp.Data.GraphQL.Integration.sln
deleted file mode 100644
index 2e5079801..000000000
--- a/FSharp.Data.GraphQL.Integration.sln
+++ /dev/null
@@ -1,141 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33312.197
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D52DCCB-1899-47FB-9F7A-1571E444B4CE}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		Packages.props = Packages.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BA7F22E2-D411-4229-826B-F55FF171D12A}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.IntegrationTests.Server", "tests\FSharp.Data.GraphQL.IntegrationTests.Server\FSharp.Data.GraphQL.IntegrationTests.Server.fsproj", "{E6754A20-FA5E-4C76-AB1B-D35DF9526889}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.IntegrationTests", "tests\FSharp.Data.GraphQL.IntegrationTests\FSharp.Data.GraphQL.IntegrationTests.fsproj", "{09D910E6-94EF-46AF-94DF-10A9FEC837C0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BDE03396-2ED6-4153-B94C-351BAB3F67BD}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Shared", "src\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj", "{237F9575-6E65-40DD-A77B-BA2882BD5646}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server", "src\FSharp.Data.GraphQL.Server\FSharp.Data.GraphQL.Server.fsproj", "{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.AspNetCore", "src\FSharp.Data.GraphQL.Server.AspNetCore\FSharp.Data.GraphQL.Server.AspNetCore.fsproj", "{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Giraffe", "src\FSharp.Data.GraphQL.Server.Giraffe\FSharp.Data.GraphQL.Server.Giraffe.fsproj", "{2D127253-7C00-4985-A127-F840003CB70B}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Oxpecker", "src\FSharp.Data.GraphQL.Server.Oxpecker\FSharp.Data.GraphQL.Server.Oxpecker.fsproj", "{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Debug|x64.Build.0 = Debug|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Debug|x86.Build.0 = Debug|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Release|x64.ActiveCfg = Release|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Release|x64.Build.0 = Release|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Release|x86.ActiveCfg = Release|Any CPU
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889}.Release|x86.Build.0 = Release|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Debug|x64.Build.0 = Debug|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Debug|x86.Build.0 = Debug|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x64.ActiveCfg = Release|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x64.Build.0 = Release|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x86.ActiveCfg = Release|Any CPU
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0}.Release|x86.Build.0 = Release|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|x64.Build.0 = Debug|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Debug|x86.Build.0 = Debug|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|Any CPU.Build.0 = Release|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x64.ActiveCfg = Release|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x64.Build.0 = Release|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x86.ActiveCfg = Release|Any CPU
-		{237F9575-6E65-40DD-A77B-BA2882BD5646}.Release|x86.Build.0 = Release|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x64.Build.0 = Debug|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Debug|x86.Build.0 = Debug|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x64.ActiveCfg = Release|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x64.Build.0 = Release|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x86.ActiveCfg = Release|Any CPU
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC}.Release|x86.Build.0 = Release|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|x64.Build.0 = Debug|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Release|x64.ActiveCfg = Release|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Release|x64.Build.0 = Release|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4}.Release|x86.Build.0 = Release|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Debug|x64.Build.0 = Debug|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Debug|x86.Build.0 = Debug|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Release|x64.ActiveCfg = Release|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Release|x64.Build.0 = Release|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D127253-7C00-4985-A127-F840003CB70B}.Release|x86.Build.0 = Release|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Debug|x64.Build.0 = Debug|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Debug|x86.Build.0 = Debug|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Release|x64.ActiveCfg = Release|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Release|x64.Build.0 = Release|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E6754A20-FA5E-4C76-AB1B-D35DF9526889} = {BA7F22E2-D411-4229-826B-F55FF171D12A}
-		{09D910E6-94EF-46AF-94DF-10A9FEC837C0} = {BA7F22E2-D411-4229-826B-F55FF171D12A}
-		{237F9575-6E65-40DD-A77B-BA2882BD5646} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
-		{CA16AC10-9FF2-4894-AC73-99FBD35BB8CC} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
-		{9E795521-CC0E-4E9C-9DC1-66CFCC7A31C4} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
-		{2D127253-7C00-4985-A127-F840003CB70B} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
-		{D0F02E6B-606E-4EE4-8A23-83990C71FA0E} = {BDE03396-2ED6-4153-B94C-351BAB3F67BD}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1B712506-56AA-424E-9DB7-47BCF3894516}
-	EndGlobalSection
-EndGlobal
diff --git a/FSharp.Data.GraphQL.Integration.slnx b/FSharp.Data.GraphQL.Integration.slnx
new file mode 100644
index 000000000..ebd077769
--- /dev/null
+++ b/FSharp.Data.GraphQL.Integration.slnx
@@ -0,0 +1,23 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="Packages.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/FSharp.Data.GraphQL.Server.AspNetCore/FSharp.Data.GraphQL.Server.AspNetCore.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Giraffe/FSharp.Data.GraphQL.Server.Giraffe.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Oxpecker/FSharp.Data.GraphQL.Server.Oxpecker.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server/FSharp.Data.GraphQL.Server.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/FSharp.Data.GraphQL.IntegrationTests.Server/FSharp.Data.GraphQL.IntegrationTests.Server.fsproj" />
+    <Project Path="tests/FSharp.Data.GraphQL.IntegrationTests/FSharp.Data.GraphQL.IntegrationTests.fsproj" />
+  </Folder>
+</Solution>
diff --git a/FSharp.Data.GraphQL.sln b/FSharp.Data.GraphQL.sln
deleted file mode 100644
index 1fe3f9cfd..000000000
--- a/FSharp.Data.GraphQL.sln
+++ /dev/null
@@ -1,393 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32811.315
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E3330910-8B6C-4191-8046-D6D57FBC39B1}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		global.json = global.json
-		LICENSE.txt = LICENSE.txt
-		Packages.props = Packages.props
-		Prepare template project for packing.ps1 = Prepare template project for packing.ps1
-		README.md = README.md
-		RELEASE_NOTES.md = RELEASE_NOTES.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{313AC7F5-4282-4779-8FEF-1536B4145860}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\publish_ci.yml = .github\workflows\publish_ci.yml
-		.github\workflows\publish_release.yml = .github\workflows\publish_release.yml
-		.github\workflows\pull_request.yml = .github\workflows\pull_request.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{56640EAF-82A6-4439-AD14-69F44A90DA99}"
-	ProjectSection(SolutionItems) = preProject
-		docs\files\introspection_query.graphql = docs\files\introspection_query.graphql
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{78D10788-601D-4D53-808B-36661911EDD1}"
-	ProjectSection(SolutionItems) = preProject
-		docs\files\img\logo-template.pdn = docs\files\img\logo-template.pdn
-		docs\files\img\logo.png = docs\files\img\logo.png
-	EndProjectSection
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "star-wars-api", "samples\star-wars-api\star-wars-api.fsproj", "{B837B3ED-83CE-446F-A4E5-44CB06AA6505}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "chat-app", "samples\chat-app\server\chat-app.fsproj", "{225B0790-C6B6-425C-9093-F359A4C635D3}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "relay-book-store", "samples\relay-book-store\relay-book-store.fsproj", "{C24EB38E-326C-4770-BB20-9838694EE5E6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEFD8748-2467-45F9-A4AD-B450B12D5F78}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Shared", "src\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj", "{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server", "src\FSharp.Data.GraphQL.Server\FSharp.Data.GraphQL.Server.fsproj", "{474179D3-0090-49E9-88F8-2971C0966077}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.AspNetCore", "src\FSharp.Data.GraphQL.Server.AspNetCore\FSharp.Data.GraphQL.Server.AspNetCore.fsproj", "{554A6833-1E72-41B4-AAC1-C19371EC061B}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Giraffe", "src\FSharp.Data.GraphQL.Server.Giraffe\FSharp.Data.GraphQL.Server.Giraffe.fsproj", "{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Oxpecker", "src\FSharp.Data.GraphQL.Server.Oxpecker\FSharp.Data.GraphQL.Server.Oxpecker.fsproj", "{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Relay", "src\FSharp.Data.GraphQL.Server.Relay\FSharp.Data.GraphQL.Server.Relay.fsproj", "{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.Middleware", "src\FSharp.Data.GraphQL.Server.Middleware\FSharp.Data.GraphQL.Server.Middleware.fsproj", "{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client.DesignTime", "src\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj", "{B075CD55-CEA4-4C30-A088-48319AADF070}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client", "src\FSharp.Data.GraphQL.Client\FSharp.Data.GraphQL.Client.fsproj", "{F7858DA7-E067-486B-9E9C-697F0A56C620}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B075CD55-CEA4-4C30-A088-48319AADF070} = {B075CD55-CEA4-4C30-A088-48319AADF070}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
-	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-		RELEASE_NOTES.md = RELEASE_NOTES.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{83F16175-43B1-4C90-A1EE-8E351C33435D}"
-	ProjectSection(SolutionItems) = preProject
-		docs\tools\generate.fsx = docs\tools\generate.fsx
-		docs\tools\templates\template.cshtml = docs\tools\templates\template.cshtml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D5255-776D-4B61-85F9-73C37AA1FB9A}"
-	ProjectSection(SolutionItems) = preProject
-		docs\content\execution-pipeline.md = docs\content\execution-pipeline.md
-		docs\content\index.md = docs\content\index.md
-		docs\content\linq.md = docs\content\linq.md
-		docs\content\type-system.md = docs\content\type-system.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Tests", "tests\FSharp.Data.GraphQL.Tests\FSharp.Data.GraphQL.Tests.fsproj", "{54AAFE43-FA5F-485A-AD40-0240165FC633}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Benchmarks", "tests\FSharp.Data.GraphQL.Benchmarks\FSharp.Data.GraphQL.Benchmarks.fsproj", "{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B0C25450-74BF-40C2-9E02-09AADBAE2C2F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "graphiql-client", "graphiql-client", "{CAE5916B-1415-4982-B705-7318D77C029C}"
-	ProjectSection(SolutionItems) = preProject
-		samples\graphiql-client\.babelrc = samples\graphiql-client\.babelrc
-		samples\graphiql-client\index.html = samples\graphiql-client\index.html
-		samples\graphiql-client\index.jsx = samples\graphiql-client\index.jsx
-		samples\graphiql-client\package-lock.json = samples\graphiql-client\package-lock.json
-		samples\graphiql-client\package.json = samples\graphiql-client\package.json
-		samples\graphiql-client\webpack.config.js = samples\graphiql-client\webpack.config.js
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client-provider", "client-provider", "{3D948D55-3CD2-496D-A04C-3B4E7BB69140}"
-	ProjectSection(SolutionItems) = preProject
-		samples\client-provider\field_aliases.fsx = samples\client-provider\field_aliases.fsx
-		samples\client-provider\github_access.fsx = samples\client-provider\github_access.fsx
-		samples\client-provider\github_authorization_headers.headerfile = samples\client-provider\github_authorization_headers.headerfile
-		samples\client-provider\github_schema.json = samples\client-provider\github_schema.json
-		samples\client-provider\graphql_client.fsx = samples\client-provider\graphql_client.fsx
-		samples\client-provider\http_headers1.headerfile = samples\client-provider\http_headers1.headerfile
-		samples\client-provider\http_headers2.headerfile = samples\client-provider\http_headers2.headerfile
-		samples\client-provider\http_headers_introspection.fsx = samples\client-provider\http_headers_introspection.fsx
-		samples\client-provider\mutations.fsx = samples\client-provider\mutations.fsx
-		samples\client-provider\operation.graphql = samples\client-provider\operation.graphql
-		samples\client-provider\parameters.fsx = samples\client-provider\parameters.fsx
-		samples\client-provider\short_hand_query.fsx = samples\client-provider\short_hand_query.fsx
-		samples\client-provider\standard_features.fsx = samples\client-provider\standard_features.fsx
-		samples\client-provider\swapi_schema.json = samples\client-provider\swapi_schema.json
-		samples\client-provider\using_query_file.fsx = samples\client-provider\using_query_file.fsx
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "file-upload", "file-upload", "{A47968E2-CDD1-4BCF-9093-D0C5225A815B}"
-	ProjectSection(SolutionItems) = preProject
-		samples\client-provider\file-upload\multiple_files_upload.fsx = samples\client-provider\file-upload\multiple_files_upload.fsx
-		samples\client-provider\file-upload\png_file.png = samples\client-provider\file-upload\png_file.png
-		samples\client-provider\file-upload\README.md = samples\client-provider\file-upload\README.md
-		samples\client-provider\file-upload\single_file_upload.fsx = samples\client-provider\file-upload\single_file_upload.fsx
-		samples\client-provider\file-upload\txt_file.txt = samples\client-provider\file-upload\txt_file.txt
-		samples\client-provider\file-upload\uploaded_files.fsx = samples\client-provider\file-upload\uploaded_files.fsx
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{9D5C46E8-0C07-4384-8E58-903F7C2C7171}"
-	ProjectSection(SolutionItems) = preProject
-		samples\client-provider\file-upload\server\.env = samples\client-provider\file-upload\server\.env
-		samples\client-provider\file-upload\server\.gitignore = samples\client-provider\file-upload\server\.gitignore
-		samples\client-provider\file-upload\server\package-lock.json = samples\client-provider\file-upload\server\package-lock.json
-		samples\client-provider\file-upload\server\package.json = samples\client-provider\file-upload\server\package.json
-		samples\client-provider\file-upload\server\resolvers.mjs = samples\client-provider\file-upload\server\resolvers.mjs
-		samples\client-provider\file-upload\server\server.mjs = samples\client-provider\file-upload\server\server.mjs
-		samples\client-provider\file-upload\server\types.mjs = samples\client-provider\file-upload\server\types.mjs
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "relay-modern-starter-kit", "relay-modern-starter-kit", "{600D4BE2-FCE0-4684-AC6F-2DC829B395BA}"
-	ProjectSection(SolutionItems) = preProject
-		samples\relay-modern-starter-kit\.babelrc = samples\relay-modern-starter-kit\.babelrc
-		samples\relay-modern-starter-kit\index.html = samples\relay-modern-starter-kit\index.html
-		samples\relay-modern-starter-kit\package.json = samples\relay-modern-starter-kit\package.json
-		samples\relay-modern-starter-kit\server.fsx = samples\relay-modern-starter-kit\server.fsx
-		samples\relay-modern-starter-kit\webpack.config.js = samples\relay-modern-starter-kit\webpack.config.js
-		samples\relay-modern-starter-kit\yarn.lock = samples\relay-modern-starter-kit\yarn.lock
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{E9DACEDD-1166-4142-9726-33CCA56218BA}"
-	ProjectSection(SolutionItems) = preProject
-		samples\relay-modern-starter-kit\data\schema.json = samples\relay-modern-starter-kit\data\schema.json
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8F031E0-2BD5-4BAE-830A-60CBA76A047D}"
-	ProjectSection(SolutionItems) = preProject
-		samples\relay-modern-starter-kit\src\app.jsx = samples\relay-modern-starter-kit\src\app.jsx
-		samples\relay-modern-starter-kit\src\relayEnvironment.js = samples\relay-modern-starter-kit\src\relayEnvironment.js
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{6EEA0E79-693F-4D4F-B55B-DB0C64EBDA45}"
-	ProjectSection(SolutionItems) = preProject
-		jsonToGraphql.js = jsonToGraphql.js
-		samples\relay-modern-starter-kit\scripts\jsonToGraphql.js = samples\relay-modern-starter-kit\scripts\jsonToGraphql.js
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{7AA3516E-60F5-4969-878F-4E3DCF3E63A3}"
-	ProjectSection(SolutionItems) = preProject
-		user.jsx = user.jsx
-		samples\relay-modern-starter-kit\src\components\user.jsx = samples\relay-modern-starter-kit\src\components\user.jsx
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x64.Build.0 = Debug|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Debug|x86.Build.0 = Debug|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.ActiveCfg = Release|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.Build.0 = Release|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.ActiveCfg = Release|Any CPU
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.Build.0 = Release|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Debug|x64.Build.0 = Debug|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Debug|x86.Build.0 = Debug|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Release|x64.ActiveCfg = Release|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Release|x64.Build.0 = Release|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Release|x86.ActiveCfg = Release|Any CPU
-		{225B0790-C6B6-425C-9093-F359A4C635D3}.Release|x86.Build.0 = Release|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Debug|x64.Build.0 = Debug|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Debug|x86.Build.0 = Debug|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Release|x64.ActiveCfg = Release|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Release|x64.Build.0 = Release|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Release|x86.ActiveCfg = Release|Any CPU
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6}.Release|x86.Build.0 = Release|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Debug|x64.Build.0 = Debug|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Debug|x86.Build.0 = Debug|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Release|Any CPU.Build.0 = Release|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Release|x64.ActiveCfg = Release|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Release|x64.Build.0 = Release|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Release|x86.ActiveCfg = Release|Any CPU
-		{474179D3-0090-49E9-88F8-2971C0966077}.Release|x86.Build.0 = Release|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Debug|x64.Build.0 = Debug|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Debug|x86.Build.0 = Debug|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Release|x64.ActiveCfg = Release|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Release|x64.Build.0 = Release|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Release|x86.ActiveCfg = Release|Any CPU
-		{554A6833-1E72-41B4-AAC1-C19371EC061B}.Release|x86.Build.0 = Release|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Debug|x64.Build.0 = Debug|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Debug|x86.Build.0 = Debug|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Release|x64.ActiveCfg = Release|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Release|x64.Build.0 = Release|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Release|x86.ActiveCfg = Release|Any CPU
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80}.Release|x86.Build.0 = Release|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Debug|x64.Build.0 = Debug|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Debug|x86.Build.0 = Debug|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Release|x64.ActiveCfg = Release|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Release|x64.Build.0 = Release|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Release|x86.ActiveCfg = Release|Any CPU
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E}.Release|x86.Build.0 = Release|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x64.Build.0 = Release|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}.Release|x86.Build.0 = Release|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Debug|x64.Build.0 = Debug|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Debug|x86.Build.0 = Debug|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Release|x64.ActiveCfg = Release|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Release|x64.Build.0 = Release|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Release|x86.ActiveCfg = Release|Any CPU
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067}.Release|x86.Build.0 = Release|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Debug|x64.Build.0 = Debug|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Debug|x86.Build.0 = Debug|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Release|x64.ActiveCfg = Release|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Release|x64.Build.0 = Release|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Release|x86.ActiveCfg = Release|Any CPU
-		{B075CD55-CEA4-4C30-A088-48319AADF070}.Release|x86.Build.0 = Release|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Debug|x64.Build.0 = Debug|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Debug|x86.Build.0 = Debug|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x64.ActiveCfg = Release|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x64.Build.0 = Release|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x86.ActiveCfg = Release|Any CPU
-		{F7858DA7-E067-486B-9E9C-697F0A56C620}.Release|x86.Build.0 = Release|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|x64.Build.0 = Debug|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Debug|x86.Build.0 = Debug|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Release|x64.ActiveCfg = Release|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Release|x64.Build.0 = Release|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Release|x86.ActiveCfg = Release|Any CPU
-		{54AAFE43-FA5F-485A-AD40-0240165FC633}.Release|x86.Build.0 = Release|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Release|x64.Build.0 = Release|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}.Release|x86.Build.0 = Release|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Debug|x64.Build.0 = Debug|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Debug|x86.Build.0 = Debug|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Release|x64.ActiveCfg = Release|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Release|x64.Build.0 = Release|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{C24EB38E-326C-4770-BB20-9838694EE5E6}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{56640EAF-82A6-4439-AD14-69F44A90DA99} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
-		{78D10788-601D-4D53-808B-36661911EDD1} = {56640EAF-82A6-4439-AD14-69F44A90DA99}
-		{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{225B0790-C6B6-425C-9093-F359A4C635D3} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{6768EA38-1335-4B8E-BC09-CCDED1F9AAF6} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{474179D3-0090-49E9-88F8-2971C0966077} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{554A6833-1E72-41B4-AAC1-C19371EC061B} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{B075CD55-CEA4-4C30-A088-48319AADF070} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{F7858DA7-E067-486B-9E9C-697F0A56C620} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
-		{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
-		{54AAFE43-FA5F-485A-AD40-0240165FC633} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
-		{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
-		{CAE5916B-1415-4982-B705-7318D77C029C} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{3D948D55-3CD2-496D-A04C-3B4E7BB69140} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{A47968E2-CDD1-4BCF-9093-D0C5225A815B} = {3D948D55-3CD2-496D-A04C-3B4E7BB69140}
-		{9D5C46E8-0C07-4384-8E58-903F7C2C7171} = {A47968E2-CDD1-4BCF-9093-D0C5225A815B}
-		{600D4BE2-FCE0-4684-AC6F-2DC829B395BA} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{E9DACEDD-1166-4142-9726-33CCA56218BA} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
-		{A8F031E0-2BD5-4BAE-830A-60CBA76A047D} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
-		{6EEA0E79-693F-4D4F-B55B-DB0C64EBDA45} = {600D4BE2-FCE0-4684-AC6F-2DC829B395BA}
-		{7AA3516E-60F5-4969-878F-4E3DCF3E63A3} = {A8F031E0-2BD5-4BAE-830A-60CBA76A047D}
-		{C24EB38E-326C-4770-BB20-9838694EE5E6} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}
-	EndGlobalSection
-EndGlobal
diff --git a/FSharp.Data.GraphQL.slnx b/FSharp.Data.GraphQL.slnx
new file mode 100644
index 000000000..9a713200c
--- /dev/null
+++ b/FSharp.Data.GraphQL.slnx
@@ -0,0 +1,130 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/docs/" />
+  <Folder Name="/docs/content/">
+    <File Path="docs/content/execution-pipeline.md" />
+    <File Path="docs/content/index.md" />
+    <File Path="docs/content/linq.md" />
+    <File Path="docs/content/type-system.md" />
+  </Folder>
+  <Folder Name="/docs/files/">
+    <File Path="docs/files/introspection_query.graphql" />
+  </Folder>
+  <Folder Name="/docs/files/img/">
+    <File Path="docs/files/img/logo-template.pdn" />
+    <File Path="docs/files/img/logo.png" />
+  </Folder>
+  <Folder Name="/docs/tools/">
+    <File Path="docs/tools/generate.fsx" />
+    <File Path="docs/tools/templates/template.cshtml" />
+  </Folder>
+  <Folder Name="/GitHub/">
+    <File Path=".github/workflows/publish_ci.yml" />
+    <File Path=".github/workflows/publish_release.yml" />
+    <File Path=".github/workflows/pull_request.yml" />
+  </Folder>
+  <Folder Name="/project/">
+    <File Path="README.md" />
+    <File Path="RELEASE_NOTES.md" />
+  </Folder>
+  <Folder Name="/samples/">
+    <Project Path="samples/chat-app/server/chat-app.fsproj" />
+    <Project Path="samples/relay-book-store/relay-book-store.fsproj" />
+    <Project Path="samples/star-wars-api/star-wars-api.fsproj" />
+  </Folder>
+  <Folder Name="/samples/client-provider/">
+    <File Path="samples/client-provider/field_aliases.fsx" />
+    <File Path="samples/client-provider/github_access.fsx" />
+    <File Path="samples/client-provider/github_authorization_headers.headerfile" />
+    <File Path="samples/client-provider/github_schema.json" />
+    <File Path="samples/client-provider/graphql_client.fsx" />
+    <File Path="samples/client-provider/http_headers1.headerfile" />
+    <File Path="samples/client-provider/http_headers2.headerfile" />
+    <File Path="samples/client-provider/http_headers_introspection.fsx" />
+    <File Path="samples/client-provider/mutations.fsx" />
+    <File Path="samples/client-provider/operation.graphql" />
+    <File Path="samples/client-provider/parameters.fsx" />
+    <File Path="samples/client-provider/short_hand_query.fsx" />
+    <File Path="samples/client-provider/standard_features.fsx" />
+    <File Path="samples/client-provider/swapi_schema.json" />
+    <File Path="samples/client-provider/using_query_file.fsx" />
+  </Folder>
+  <Folder Name="/samples/client-provider/file-upload/">
+    <File Path="samples/client-provider/file-upload/multiple_files_upload.fsx" />
+    <File Path="samples/client-provider/file-upload/png_file.png" />
+    <File Path="samples/client-provider/file-upload/README.md" />
+    <File Path="samples/client-provider/file-upload/single_file_upload.fsx" />
+    <File Path="samples/client-provider/file-upload/txt_file.txt" />
+    <File Path="samples/client-provider/file-upload/uploaded_files.fsx" />
+  </Folder>
+  <Folder Name="/samples/client-provider/file-upload/server/">
+    <File Path="samples/client-provider/file-upload/server/.env" />
+    <File Path="samples/client-provider/file-upload/server/.gitignore" />
+    <File Path="samples/client-provider/file-upload/server/package-lock.json" />
+    <File Path="samples/client-provider/file-upload/server/package.json" />
+    <File Path="samples/client-provider/file-upload/server/resolvers.mjs" />
+    <File Path="samples/client-provider/file-upload/server/server.mjs" />
+    <File Path="samples/client-provider/file-upload/server/types.mjs" />
+  </Folder>
+  <Folder Name="/samples/graphiql-client/">
+    <File Path="samples/graphiql-client/.babelrc" />
+    <File Path="samples/graphiql-client/index.html" />
+    <File Path="samples/graphiql-client/index.jsx" />
+    <File Path="samples/graphiql-client/package-lock.json" />
+    <File Path="samples/graphiql-client/package.json" />
+    <File Path="samples/graphiql-client/webpack.config.js" />
+  </Folder>
+  <Folder Name="/samples/relay-modern-starter-kit/">
+    <File Path="samples/relay-modern-starter-kit/.babelrc" />
+    <File Path="samples/relay-modern-starter-kit/index.html" />
+    <File Path="samples/relay-modern-starter-kit/package.json" />
+    <File Path="samples/relay-modern-starter-kit/server.fsx" />
+    <File Path="samples/relay-modern-starter-kit/webpack.config.js" />
+    <File Path="samples/relay-modern-starter-kit/yarn.lock" />
+  </Folder>
+  <Folder Name="/samples/relay-modern-starter-kit/data/">
+    <File Path="samples/relay-modern-starter-kit/data/schema.json" />
+  </Folder>
+  <Folder Name="/samples/relay-modern-starter-kit/scripts/">
+    <File Path="samples/relay-modern-starter-kit/scripts/jsonToGraphql.js" />
+  </Folder>
+  <Folder Name="/samples/relay-modern-starter-kit/src/">
+    <File Path="samples/relay-modern-starter-kit/src/app.jsx" />
+    <File Path="samples/relay-modern-starter-kit/src/relayEnvironment.js" />
+  </Folder>
+  <Folder Name="/samples/relay-modern-starter-kit/src/components/">
+    <File Path="samples/relay-modern-starter-kit/src/components/user.jsx" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="global.json" />
+    <File Path="LICENSE.txt" />
+    <File Path="Packages.props" />
+    <File Path="Prepare template project for packing.ps1" />
+    <File Path="README.md" />
+    <File Path="RELEASE_NOTES.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj">
+      <BuildDependency Project="src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj" />
+    </Project>
+    <Project Path="src/FSharp.Data.GraphQL.Server.AspNetCore/FSharp.Data.GraphQL.Server.AspNetCore.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Giraffe/FSharp.Data.GraphQL.Server.Giraffe.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Middleware/FSharp.Data.GraphQL.Server.Middleware.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Oxpecker/FSharp.Data.GraphQL.Server.Oxpecker.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server.Relay/FSharp.Data.GraphQL.Server.Relay.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Server/FSharp.Data.GraphQL.Server.fsproj" />
+    <Project Path="src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/FSharp.Data.GraphQL.Benchmarks/FSharp.Data.GraphQL.Benchmarks.fsproj" />
+    <Project Path="tests/FSharp.Data.GraphQL.Tests/FSharp.Data.GraphQL.Tests.fsproj" />
+  </Folder>
+</Solution>
diff --git a/Packages.props b/Packages.props
index 579aef5ab..e2860d90f 100644
--- a/Packages.props
+++ b/Packages.props
@@ -5,7 +5,7 @@
     <MicrosoftExtensionsVersion>8.0.*</MicrosoftExtensionsVersion>
     <AspNetCoreVersion>8.0.*</AspNetCoreVersion>
     <FSharpCoreVersion>9.0.202</FSharpCoreVersion>
-    <FsToolkitVersion>4.18.*</FsToolkitVersion>
+    <FsToolkitVersion>4.17.*</FsToolkitVersion>
     <XUnitVersion>2.9.3</XUnitVersion>
     <FAKEVersion>6.*</FAKEVersion>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Update="Microsoft.NETCore.Platforms" Version="$(SystemVersion)" />
     <PackageReference Update="NuGet.CommandLine" Version="1.*" />
-    <PackageReference Update="Oxpecker" Version="1.*" />
+    <PackageReference Update="Oxpecker" Version="1.3.*" />
     <PackageReference Update="System.CodeDom" Version="$(SystemVersion)" />
     <PackageReference Update="System.Collections.Immutable" Version="$(SystemVersion)" />
     <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemVersion)" />
@@ -53,7 +53,7 @@
   <ItemGroup Label="Test platform">
     <PackageReference Update="BenchmarkDotNet" Version="0.15.*" />
     <PackageReference Update="BenchmarkDotNet.Annotations" Version="0.*" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Update="Microsoft.TestPlatform.TestHost" Version="17.7.*" />
     <PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.7.*" />
     <PackageReference Update="xunit" Version="$(XUnitVersion)" />
@@ -64,7 +64,7 @@
     <PackageReference Update="xunit.extensibility.execution" Version="$(XUnitVersion)" />
     <PackageReference Update="xunit.runner.console" Version="$(XUnitVersion)" />
     <PackageReference Update="xunit.runner.utility" Version="$(XUnitVersion)" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="3.1.0" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="3.1.4" />
   </ItemGroup>
   <ItemGroup Label="Tests and Samples">
     <PackageReference Update="CommandLineParser" Version="2.9.*" />
diff --git a/build/Program.fs b/build/Program.fs
index 8bc4aed54..77f231180 100644
--- a/build/Program.fs
+++ b/build/Program.fs
@@ -74,7 +74,7 @@ Target.create RestoreTarget <| fun _ ->
 
 let [<Literal>] BuildTarget = "Build"
 Target.create BuildTarget <| fun _ ->
-    "FSharp.Data.GraphQL.sln"
+    "FSharp.Data.GraphQL.slnx"
     |> DotNet.build (fun options -> {
         options with
             Configuration = configuration
diff --git a/samples/star-wars-fabulous-client/StarWars.sln b/samples/star-wars-fabulous-client/StarWars.sln
deleted file mode 100644
index a6f1ba95a..000000000
--- a/samples/star-wars-fabulous-client/StarWars.sln
+++ /dev/null
@@ -1,461 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.10
-MinimumVisualStudioVersion = 10.0.40219.1
-
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StarWars", "StarWars\StarWars.fsproj", "{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}"
-EndProject
-
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "StarWars.Android", "StarWars.Android\StarWars.Android.fsproj", "{F0354F33-FDE2-4232-9E71-A85CECCE7365}"
-EndProject
-
-
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "StarWars.iOS", "StarWars.iOS\StarWars.iOS.fsproj", "{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}"
-EndProject
-
-
-
-
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|ARM = Ad-Hoc|ARM
-		Ad-Hoc|iPhone = Ad-Hoc|iPhone
-		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		Ad-Hoc|x64 = Ad-Hoc|x64
-		Ad-Hoc|x86 = Ad-Hoc|x86
-		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|ARM = AppStore|ARM
-		AppStore|iPhone = AppStore|iPhone
-		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
-		AppStore|x64 = AppStore|x64
-		AppStore|x86 = AppStore|x86
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|x64.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.AppStore|x86.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|x64.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|ARM.Build.0 = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|iPhone.Build.0 = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|x64.ActiveCfg = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|x64.Build.0 = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{C7F6EFB7-0D7E-4A34-90D0-2338D6785EF5}.Release|x86.Build.0 = Release|Any CPU
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|iPhone.Build.0 = Debug|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|x64.ActiveCfg = Debug|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Debug|x86.ActiveCfg = Debug|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|ARM.ActiveCfg = Release|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|iPhone.ActiveCfg = Release|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|iPhone.Build.0 = Release|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|x64.ActiveCfg = Release|iPhone
-		{BEC716FD-A585-4E2D-9AC3-53B4B45EBB62}.Release|x86.ActiveCfg = Release|iPhone
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|Any CPU.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|ARM.Build.0 = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|iPhone.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|iPhone.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|iPhone.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|x64.ActiveCfg = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|x64.Build.0 = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|x64.Deploy.0 = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|x86.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|x86.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Ad-Hoc|x86.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|Any CPU.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|Any CPU.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|Any CPU.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|ARM.ActiveCfg = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|ARM.Build.0 = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|ARM.Deploy.0 = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|iPhone.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|iPhone.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|iPhone.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|iPhoneSimulator.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|iPhoneSimulator.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|x64.ActiveCfg = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|x64.Build.0 = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|x64.Deploy.0 = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|x86.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|x86.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.AppStore|x86.Deploy.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|ARM.Build.0 = Debug|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|iPhone.ActiveCfg = Debug|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|x64.ActiveCfg = Debug|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|x64.Build.0 = Debug|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|x64.Deploy.0 = Debug|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|x86.ActiveCfg = Debug|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|x86.Build.0 = Debug|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Debug|x86.Deploy.0 = Debug|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|Any CPU.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|ARM.ActiveCfg = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|ARM.Build.0 = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|ARM.Deploy.0 = Release|ARM
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|iPhone.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|iPhoneSimulator.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|x64.ActiveCfg = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|x64.Build.0 = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|x64.Deploy.0 = Release|x64
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|x86.ActiveCfg = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|x86.Build.0 = Release|x86
-		{89F219C0-2B41-422D-9458-94F98C9986AF}.Release|x86.Deploy.0 = Release|x86
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|ARM.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|x64.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.AppStore|x86.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|ARM.Build.0 = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|x64.Build.0 = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Debug|x86.Build.0 = Debug|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|ARM.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|ARM.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|iPhone.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|x64.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|x64.Build.0 = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|x86.ActiveCfg = Release|Any CPU
-		{ADD048B1-1142-4870-AF6A-E10A65949795}.Release|x86.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|ARM.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|x64.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.AppStore|x86.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|x64.Build.0 = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Debug|x86.Build.0 = Debug|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|ARM.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|iPhone.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|x64.Build.0 = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|x86.ActiveCfg = Release|Any CPU
-		{5BEE4055-91E6-4C8D-828C-40DC3B05A8DA}.Release|x86.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|ARM.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|x64.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.AppStore|x86.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|ARM.Build.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|ARM.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|iPhone.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|x64.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|x64.Build.0 = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0354F33-FDE2-4232-9E71-A85CECCE7365}.Release|x86.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|ARM.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|x64.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.AppStore|x86.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|x64.Build.0 = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Debug|x86.Build.0 = Debug|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|ARM.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|iPhone.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|x64.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|x64.Build.0 = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|x86.ActiveCfg = Release|Any CPU
-		{B9D76C72-5A85-4AE9-9EEB-E8ABC59466A9}.Release|x86.Build.0 = Release|Any CPU
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|Any CPU.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|Any CPU.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|Any CPU.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|ARM.Build.0 = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|ARM64.Build.0 = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|iPhone.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|x64.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|x64.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|x64.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|x86.ActiveCfg = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|x86.Build.0 = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Ad-Hoc|x86.Deploy.0 = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|Any CPU.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|Any CPU.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|Any CPU.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|ARM.ActiveCfg = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|ARM.Build.0 = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|ARM.Deploy.0 = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|ARM64.ActiveCfg = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|ARM64.Build.0 = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|ARM64.Deploy.0 = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|iPhone.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|iPhone.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|iPhone.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|iPhoneSimulator.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|iPhoneSimulator.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|iPhoneSimulator.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|x64.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|x64.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|x64.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|x86.ActiveCfg = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|x86.Build.0 = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.AppStore|x86.Deploy.0 = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|ARM.ActiveCfg = Debug|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|ARM.Build.0 = Debug|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|ARM.Deploy.0 = Debug|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|iPhone.ActiveCfg = Debug|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|x64.ActiveCfg = Debug|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|x64.Build.0 = Debug|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|x64.Deploy.0 = Debug|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|x86.ActiveCfg = Debug|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|x86.Build.0 = Debug|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Debug|x86.Deploy.0 = Debug|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|Any CPU.ActiveCfg = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|ARM.ActiveCfg = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|ARM.Build.0 = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|ARM.Deploy.0 = Release|ARM
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|ARM64.Build.0 = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|ARM64.Deploy.0 = Release|ARM64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|iPhone.ActiveCfg = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|iPhoneSimulator.ActiveCfg = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|x64.ActiveCfg = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|x64.Build.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|x64.Deploy.0 = Release|x64
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|x86.ActiveCfg = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|x86.Build.0 = Release|x86
-		{4C615CB6-6DA1-4EEE-8FB9-B036E1863A8B}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F6D05029-56B8-4E45-AF2D-0E76295DDBA2}
-	EndGlobalSection
-EndGlobal
diff --git a/samples/star-wars-fabulous-client/StarWars.slnx b/samples/star-wars-fabulous-client/StarWars.slnx
new file mode 100644
index 000000000..51d68264a
--- /dev/null
+++ b/samples/star-wars-fabulous-client/StarWars.slnx
@@ -0,0 +1,36 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Ad-Hoc" />
+    <BuildType Name="AppStore" />
+    <BuildType Name="Debug" />
+    <BuildType Name="Release" />
+    <Platform Name="Any CPU" />
+    <Platform Name="ARM" />
+    <Platform Name="iPhone" />
+    <Platform Name="iPhoneSimulator" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="StarWars.Android/StarWars.Android.fsproj">
+    <BuildType Solution="Ad-Hoc|*" Project="Release" />
+    <BuildType Solution="AppStore|*" Project="Release" />
+    <Deploy Solution="Debug|Any CPU" />
+    <Deploy Solution="Release|Any CPU" />
+  </Project>
+  <Project Path="StarWars.iOS/StarWars.iOS.fsproj">
+    <Platform Solution="*|Any CPU" Project="iPhone" />
+    <Platform Solution="*|ARM" Project="iPhone" />
+    <Platform Solution="*|iPhone" Project="iPhone" />
+    <Platform Solution="*|iPhoneSimulator" Project="iPhoneSimulator" />
+    <Platform Solution="*|x64" Project="iPhone" />
+    <Platform Solution="*|x86" Project="iPhone" />
+    <Build Solution="*|Any CPU" Project="false" />
+    <Build Solution="*|ARM" Project="false" />
+    <Build Solution="*|x64" Project="false" />
+    <Build Solution="*|x86" Project="false" />
+  </Project>
+  <Project Path="StarWars/StarWars.fsproj">
+    <BuildType Solution="Ad-Hoc|*" Project="Debug" />
+    <BuildType Solution="AppStore|*" Project="Debug" />
+  </Project>
+</Solution>
diff --git a/src/FSharp.Data.GraphQL.Client/MimeTypes.fs b/src/FSharp.Data.GraphQL.Client/MimeTypes.fs
index 4039a6821..d8cc5b6a3 100644
--- a/src/FSharp.Data.GraphQL.Client/MimeTypes.fs
+++ b/src/FSharp.Data.GraphQL.Client/MimeTypes.fs
@@ -1,4 +1,4 @@
-module internal FSharp.Data.GraphQL.Client.MimeTypes
+module internal FSharp.Data.GraphQL.Client.MimeTypes
 
 open System.Collections.Generic
 open System.Collections.ObjectModel
@@ -440,6 +440,8 @@ let private dictBuilder() : IReadOnlyDictionary<string, string> =
             ".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"
             ".slk", "application/vnd.ms-excel"
             ".sln", "text/plain"
+            ".slnf", "application/json"
+            ".slnx", "application/xml"
             ".slupkg-ms", "application/x-ms-license"
             ".smi", "application/octet-stream"
             ".smx", "audio/x-smd"
@@ -622,4 +624,4 @@ let private dictBuilder() : IReadOnlyDictionary<string, string> =
     types |> Array.iter (fun (ext, mime) -> dict.Add(ext, mime))
     upcast ReadOnlyDictionary(dict)
 
-let dict = Lazy<IReadOnlyDictionary<string, string>>(dictBuilder)
\ No newline at end of file
+let dict = Lazy<IReadOnlyDictionary<string, string>>(dictBuilder)