Merge pull request #477 from fsprojects/Oxpecker

Implemented Oxpecker support
fsprojects · Sep 1, 2024 · ab9a7a0 · ab9a7a0
2 parents d96b065 + b166b99
commit ab9a7a0
Show file tree

Hide file tree

Showing 27 changed files with 581 additions and 365 deletions.
diff --git a/.github/workflows/publish_ci.yml b/.github/workflows/publish_ci.yml
@@ -88,6 +88,22 @@ jobs:
       run: |
         dotnet nuget push nuget/FSharp.Data.GraphQL.Server.AspNetCore.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
 
+    - name: Pack FSharp.Data.GraphQL.Server.Giraffe project
+      run: |
+        cd src/FSharp.Data.GraphQL.Server.Giraffe
+        dotnet pack --no-build --configuration Release /p:IsNuget=true /p:ContinuousIntegrationBuild=true -o ../../nuget
+    - name: Publish FSharp.Data.GraphQL.Server.Giraffe project to GitHub
+      run: |
+        dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Giraffe.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
+
+    - name: Pack FSharp.Data.GraphQL.Server.Oxpecker project
+      run: |
+        cd src/FSharp.Data.GraphQL.Server.Oxpecker
+        dotnet pack --no-build --configuration Release /p:IsNuget=true /p:ContinuousIntegrationBuild=true -o ../../nuget
+    - name: Publish FSharp.Data.GraphQL.Server.Oxpecker project to GitHub
+      run: |
+        dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Oxpecker.${{env.VERSION}}.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate
+
     - name: Pack FSharp.Data.GraphQL.Server.Relay project
       run: |
         cd src/FSharp.Data.GraphQL.Server.Relay

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -90,6 +90,22 @@ jobs:
       run: |
         dotnet nuget push nuget/FSharp.Data.GraphQL.Server.AspNetCore.${{env.VERSION}}.{nupkg,snupkg} -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate
 
+    - name: Pack FSharp.Data.GraphQL.Server.Oxpecker project
+      run: |
+        cd src/FSharp.Data.GraphQL.Server.Oxpecker
+        dotnet pack --no-build --configuration Release /p:IsNuget=true /p:ContinuousIntegrationBuild=true -o ../../nuget
+    - name: Publish FSharp.Data.GraphQL.Server.Oxpecker project to NuGet
+      run: |
+        dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Oxpecker.${{env.VERSION}}.{nupkg,snupkg} -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate
+
+    - name: Pack FSharp.Data.GraphQL.Server.Oxpecker project
+      run: |
+        cd src/FSharp.Data.GraphQL.Server.Oxpecker
+        dotnet pack --no-build --configuration Release /p:IsNuget=true /p:ContinuousIntegrationBuild=true -o ../../nuget
+    - name: Publish FSharp.Data.GraphQL.Server.Oxpecker project to NuGet
+      run: |
+        dotnet nuget push nuget/FSharp.Data.GraphQL.Server.Oxpecker.${{env.VERSION}}.{nupkg,snupkg} -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate
+
     - name: Pack FSharp.Data.GraphQL.Server.Relay project
       run: |
         cd src/FSharp.Data.GraphQL.Server.Relay

diff --git a/FSharp.Data.GraphQL.Integration.sln b/FSharp.Data.GraphQL.Integration.sln
@@ -24,6 +24,10 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server"
 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
@@ -94,6 +98,30 @@ Global
 		{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
@@ -104,6 +132,8 @@ Global
 		{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}

diff --git a/FSharp.Data.GraphQL.sln b/FSharp.Data.GraphQL.sln
@@ -42,15 +42,15 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Samples
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chat-app", "chat-app", "{24AB1F5A-4996-4DDA-87E0-B82B3A24C13F}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Data.GraphQL.Samples.ChatApp", "samples\chat-app\server\FSharp.Data.GraphQL.Samples.ChatApp.fsproj", "{225B0790-C6B6-425C-9093-F359A4C635D3}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Samples.ChatApp", "samples\chat-app\server\FSharp.Data.GraphQL.Samples.ChatApp.fsproj", "{225B0790-C6B6-425C-9093-F359A4C635D3}"
 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("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Data.GraphQL.Server.AspNetCore", "src\FSharp.Data.GraphQL.Server.AspNetCore\FSharp.Data.GraphQL.Server.AspNetCore.fsproj", "{554A6833-1E72-41B4-AAC1-C19371EC061B}"
+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.Relay", "src\FSharp.Data.GraphQL.Server.Relay\FSharp.Data.GraphQL.Server.Relay.fsproj", "{E011A3B2-3D96-48E3-AF5F-DA544FF5C5FE}"
 EndProject
@@ -174,6 +174,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components",
 		samples\relay-modern-starter-kit\src\components\user.jsx = samples\relay-modern-starter-kit\src\components\user.jsx
 	EndProjectSection
 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -196,6 +200,18 @@ Global
 		{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
@@ -220,6 +236,18 @@ Global
 		{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
 		{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
@@ -268,42 +296,6 @@ Global
 		{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
-		{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
-		{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
-		{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
 		{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
@@ -328,18 +320,30 @@ Global
 		{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
-		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -349,8 +353,11 @@ Global
 		{78D10788-601D-4D53-808B-36661911EDD1} = {56640EAF-82A6-4439-AD14-69F44A90DA99}
 		{F66BEE6C-0CB7-4F39-97E4-243F797E8723} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
 		{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {F66BEE6C-0CB7-4F39-97E4-243F797E8723}
+		{24AB1F5A-4996-4DDA-87E0-B82B3A24C13F} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
+		{225B0790-C6B6-425C-9093-F359A4C635D3} = {24AB1F5A-4996-4DDA-87E0-B82B3A24C13F}
 		{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}
 		{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}
@@ -368,9 +375,8 @@ Global
 		{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}
-		{554A6833-1E72-41B4-AAC1-C19371EC061B} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
-		{24AB1F5A-4996-4DDA-87E0-B82B3A24C13F} = {B0C25450-74BF-40C2-9E02-09AADBAE2C2F}
-		{225B0790-C6B6-425C-9093-F359A4C635D3} = {24AB1F5A-4996-4DDA-87E0-B82B3A24C13F}
+		{0A83D100-DE1D-49A5-B6F7-CC78C7A15F80} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
+		{7873CD7F-BCDD-47AE-9743-5D033DA84E3E} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}