[v2.0.0] Lib.AspNetCore.Mvc.JqGrid (Resolves #13)

tpeczek · Aug 20, 2017 · d8c1004 · d8c1004
1 parent 53b8e1a
commit d8c1004
Show file tree

Hide file tree

Showing 15 changed files with 260 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Lib.AspNetCore.Mvc.JqGrid 2.0.0
+### Additions and Changes
+- Support for ASP.NET Core 2.0.0
+
 ## Lib.AspNetCore.Mvc.JqGrid 1.2.0
 ### Additions and Changes
 - Added support for custom navigator elements

diff --git a/DocFx.AspNetCore.Mvc.JqGrid/DocFx.AspNetCore.Mvc.JqGrid.csproj b/DocFx.AspNetCore.Mvc.JqGrid/DocFx.AspNetCore.Mvc.JqGrid.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="api\**" />
@@ -20,8 +20,7 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="docfx.console" Version="2.17.3" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
+    <PackageReference Include="docfx.console" Version="2.22.3" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
   </ItemGroup>
 </Project>
diff --git a/DocFx.AspNetCore.Mvc.JqGrid/docfx.json b/DocFx.AspNetCore.Mvc.JqGrid/docfx.json
@@ -15,7 +15,7 @@
       ],
       "dest": "api",
       "properties": {
-        "TargetFramework": "netstandard1.6"
+        "TargetFramework": "netstandard2.0"
       }
     }
   ],

diff --git a/Lib.AspNetCore.Mvc.JqGrid.Core/Helpers/CompatibilityHelper.cs b/Lib.AspNetCore.Mvc.JqGrid.Core/Helpers/CompatibilityHelper.cs
@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Internal;
+
+namespace Lib.AspNetCore.Mvc.JqGrid.Core.Helpers
+{
+    internal static class CompatibilityHelper
+    {
+        internal static Task CompletedTask
+        {
+            get
+            {
+#if ASPNETCORE10 && !NETSTANDARD2_0
+                return TaskCache.CompletedTask;
+#elif NETSTANDARD2_0
+                return Task.CompletedTask;
+#else
+            // Not implemented, compiler break
+#endif
+            }
+        }
+    }
+}
diff --git a/Lib.AspNetCore.Mvc.JqGrid.Core/Lib.AspNetCore.Mvc.JqGrid.Core.csproj b/Lib.AspNetCore.Mvc.JqGrid.Core/Lib.AspNetCore.Mvc.JqGrid.Core.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <Description>Core server side support for jqGrid in ASP.NET Core.</Description>
     <Copyright>Copyright © 2016 - 2017 Tomasz Pęczek</Copyright>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Tomasz Pęczek</Authors>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Lib.AspNetCore.Mvc.JqGrid.Core</AssemblyName>
     <PackageId>Lib.AspNetCore.Mvc.JqGrid.Core</PackageId>
     <PackageTags>aspnetcore;aspnetcoremvc;jqgrid</PackageTags>
@@ -23,7 +23,7 @@
     <ProjectReference Include="..\Lib.AspNetCore.Mvc.JqGrid.Infrastructure\Lib.AspNetCore.Mvc.JqGrid.Infrastructure.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="1.0.0" />
-    <!--<PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Infrastructure" Version="1.1.0" />-->
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.0.0" />
+    <!--<PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Infrastructure" Version="2.0.0" />-->
   </ItemGroup>
 </Project>
diff --git a/Lib.AspNetCore.Mvc.JqGrid.Core/Request/ModelBinders/JqGridCellUpdateRequestModelBinder.cs b/Lib.AspNetCore.Mvc.JqGrid.Core/Request/ModelBinders/JqGridCellUpdateRequestModelBinder.cs
@@ -1,8 +1,10 @@
-using Microsoft.AspNetCore.Mvc.Internal;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System;
+using System;
+using System.Globalization;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
+using Lib.AspNetCore.Mvc.JqGrid.Core.Helpers;
 
 namespace Lib.AspNetCore.Mvc.JqGrid.Core.Request.ModelBinders
 {
@@ -35,7 +37,7 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
             {
                 JqGridCellUpdateRequest model = new JqGridCellUpdateRequest
                 {
-                    Id = bindingContext.ValueProvider.GetValue("id").ConvertTo<string>()
+                    Id = bindingContext.ValueProvider.GetValue("id").FirstValue
                 };
 
                 foreach (KeyValuePair<string, Type> supportedCell in SupportedCells)
@@ -53,18 +55,18 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
                 bindingContext.Result = ModelBindingResult.Failed();
             }
 
-            return TaskCache.CompletedTask;
+            return CompatibilityHelper.CompletedTask;
         }
 
         private bool BindCellProperties(JqGridCellUpdateRequest model, ModelBindingContext bindingContext, string cellName, Type cellType)
         {
             bool cellBinded = false;
 
             ValueProviderResult valueProviderResult = bindingContext.ValueProvider.GetValue(cellName);
-            if (valueProviderResult != ValueProviderResult.None)
+            if ((valueProviderResult != ValueProviderResult.None) && (valueProviderResult.Values.Count > 0))
             {
                 model.CellName = cellName;
-                model.CellValue = valueProviderResult.ConvertTo(cellType);
+                model.CellValue = (valueProviderResult.Values.Count == 1) ? (object)valueProviderResult.FirstValue : valueProviderResult.Values.ToArray();
             }
 
             return cellBinded;

diff --git a/Lib.AspNetCore.Mvc.JqGrid.Core/Request/ModelBinders/JqGridRequestModelBinder.cs b/Lib.AspNetCore.Mvc.JqGrid.Core/Request/ModelBinders/JqGridRequestModelBinder.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Globalization;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
 using Newtonsoft.Json;
+using Lib.AspNetCore.Mvc.JqGrid.Core.Helpers;
 using Lib.AspNetCore.Mvc.JqGrid.Core.Json.Converters;
 using Lib.AspNetCore.Mvc.JqGrid.Infrastructure.Enums;
 using Lib.AspNetCore.Mvc.JqGrid.Infrastructure.Searching;
@@ -50,14 +52,14 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
                 bindingContext.Result = ModelBindingResult.Failed();
             }
 
-            return TaskCache.CompletedTask;
+            return CompatibilityHelper.CompletedTask;
         }
 
         private JqGridRequest BindPagingProperties(JqGridRequest model, ModelBindingContext bindingContext)
         {
             if (!String.IsNullOrWhiteSpace(JqGridRequest.ParametersNames.PageIndex))
             {
-                model.PageIndex = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.PageIndex).ConvertTo<int>() - 1;
+                model.PageIndex = ModelBindingHelper.ConvertTo<int>(bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.PageIndex).FirstValue, CultureInfo.InvariantCulture) - 1;
             }
             else
             {
@@ -70,13 +72,13 @@ private JqGridRequest BindPagingProperties(JqGridRequest model, ModelBindingCont
                 ValueProviderResult pagesCountValueResult = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.PagesCount);
                 if (pagesCountValueResult != ValueProviderResult.None)
                 {
-                    model.PagesCount = pagesCountValueResult.ConvertTo<int>();
+                    model.PagesCount = ModelBindingHelper.ConvertTo<int>(pagesCountValueResult.FirstValue, CultureInfo.InvariantCulture);
                 }
             }
 
             if (!String.IsNullOrWhiteSpace(JqGridRequest.ParametersNames.RecordsCount))
             {
-                model.RecordsCount = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.RecordsCount).ConvertTo<int>();
+                model.RecordsCount = ModelBindingHelper.ConvertTo<int>(bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.RecordsCount).FirstValue, CultureInfo.InvariantCulture);
             }
 
             return model;
@@ -86,7 +88,7 @@ private JqGridRequest BindSortingProperties(JqGridRequest model, ModelBindingCon
         {
             if (!String.IsNullOrWhiteSpace(JqGridRequest.ParametersNames.SortingName))
             {
-                string sortingName = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.SortingName).ConvertTo<string>();
+                string sortingName = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.SortingName).FirstValue;
 
                 if (!String.IsNullOrWhiteSpace(sortingName))
                 {
@@ -97,7 +99,7 @@ private JqGridRequest BindSortingProperties(JqGridRequest model, ModelBindingCon
             if (!String.IsNullOrWhiteSpace(JqGridRequest.ParametersNames.SortingOrder))
             {
                 JqGridSortingOrders sortingOrder = JqGridSortingOrders.Asc;
-                string sortingOrderAsString = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.SortingOrder).ConvertTo<string>();
+                string sortingOrderAsString = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.SortingOrder).FirstValue;
 
                 if (!String.IsNullOrWhiteSpace(sortingOrderAsString) && Enum.TryParse(sortingOrderAsString, true, out sortingOrder))
                 {
@@ -116,7 +118,7 @@ private JqGridRequest BindSearchingProperties(JqGridRequest model, ModelBindingC
                 ValueProviderResult searchingValueResult = bindingContext.ValueProvider.GetValue(JqGridRequest.ParametersNames.Searching);
                 if (searchingValueResult != ValueProviderResult.None)
                 {
-                    model.Searching = searchingValueResult.ConvertTo<bool>();
+                    model.Searching = ModelBindingHelper.ConvertTo<bool>(searchingValueResult.FirstValue, CultureInfo.InvariantCulture);
                 }
             }
 
@@ -131,15 +133,15 @@ private JqGridRequest BindSearchingProperties(JqGridRequest model, ModelBindingC
                     JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings();
                     jsonSerializerSettings.Converters.Add(new JqGridRequestSearchingFiltersJsonConverter());
 
-                    model.SearchingFilters = JsonConvert.DeserializeObject<JqGridSearchingFilters>(searchingFiltersValueResult.ConvertTo<string>(), jsonSerializerSettings);
+                    model.SearchingFilters = JsonConvert.DeserializeObject<JqGridSearchingFilters>(searchingFiltersValueResult.FirstValue, jsonSerializerSettings);
                 }
                 else
                 {
-                    string searchingName = bindingContext.ValueProvider.GetValue(SEARCH_NAME_BINDING_KEY).ConvertTo<string>();
-                    string searchingValue = bindingContext.ValueProvider.GetValue(SEARCH_VALUE_BINDING_KEY).ConvertTo<string>();
+                    string searchingName = bindingContext.ValueProvider.GetValue(SEARCH_NAME_BINDING_KEY).FirstValue;
+                    string searchingValue = bindingContext.ValueProvider.GetValue(SEARCH_VALUE_BINDING_KEY).FirstValue;
 
                     JqGridSearchOperators searchingOperator = JqGridSearchOperators.Eq;
-                    Enum.TryParse(bindingContext.ValueProvider.GetValue(SEARCH_OPERATOR_BINDING_KEY).ConvertTo<string>(), true, out searchingOperator);
+                    Enum.TryParse(bindingContext.ValueProvider.GetValue(SEARCH_OPERATOR_BINDING_KEY).FirstValue, true, out searchingOperator);
 
                     if (!String.IsNullOrWhiteSpace(searchingName) && (!String.IsNullOrWhiteSpace(searchingValue) || ((searchingOperator & JqGridSearchOperators.NullOperators) != 0)))
                     {

diff --git a/Lib.AspNetCore.Mvc.JqGrid.DataAnnotations/Lib.AspNetCore.Mvc.JqGrid.DataAnnotations.csproj b/Lib.AspNetCore.Mvc.JqGrid.DataAnnotations/Lib.AspNetCore.Mvc.JqGrid.DataAnnotations.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <Description>Custom data annotations which allow for providing additional metadata when working with strongly typed jqGrid helper for ASP.NET Core.</Description>
     <Copyright>Copyright © 2016 - 2017 Tomasz Pęczek</Copyright>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Tomasz Pęczek</Authors>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Lib.AspNetCore.Mvc.JqGrid.DataAnnotations</AssemblyName>
     <PackageId>Lib.AspNetCore.Mvc.JqGrid.DataAnnotations</PackageId>
     <PackageTags>aspnetcore;aspnetcoremvc;jqgrid</PackageTags>
@@ -23,6 +23,6 @@
     <ProjectReference Include="..\Lib.AspNetCore.Mvc.JqGrid.Infrastructure\Lib.AspNetCore.Mvc.JqGrid.Infrastructure.csproj" />
   </ItemGroup>
   <!--<ItemGroup>
-    <PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Infrastructure" Version="1.1.0" />
+    <PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Infrastructure" Version="2.0.0" />
   </ItemGroup>-->
 </Project>
diff --git a/Lib.AspNetCore.Mvc.JqGrid.Helper/Lib.AspNetCore.Mvc.JqGrid.Helper.csproj b/Lib.AspNetCore.Mvc.JqGrid.Helper/Lib.AspNetCore.Mvc.JqGrid.Helper.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <Description>Strongly typed jqGrid helper for ASP.NET Core.</Description>
     <Copyright>Copyright © 2016 - 2017 Tomasz Pęczek</Copyright>
-    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Tomasz Pęczek</Authors>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Lib.AspNetCore.Mvc.JqGrid.Helper</AssemblyName>
     <PackageId>Lib.AspNetCore.Mvc.JqGrid.Helper</PackageId>
     <PackageTags>aspnetcore;aspnetcoremvc;jqgrid</PackageTags>
@@ -25,11 +25,11 @@
     <ProjectReference Include="..\Lib.AspNetCore.Mvc.JqGrid.DataAnnotations\Lib.AspNetCore.Mvc.JqGrid.DataAnnotations.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <!--<PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Infrastructure" Version="1.2.0" />
-    <PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Core" Version="1.1.0" />
-    <PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.DataAnnotations" Version="1.1.0" />-->
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+    <!--<PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.Core" Version="2.0.0" />
+    <PackageReference Include="Lib.AspNetCore.Mvc.JqGrid.DataAnnotations" Version="2.0.0" />-->
   </ItemGroup>
 </Project>
diff --git a/Lib.AspNetCore.Mvc.JqGrid.Infrastructure/Lib.AspNetCore.Mvc.JqGrid.Infrastructure.csproj b/Lib.AspNetCore.Mvc.JqGrid.Infrastructure/Lib.AspNetCore.Mvc.JqGrid.Infrastructure.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <Description>Common infrastructure for jqGrid support in ASP.NET Core.</Description>
     <Copyright>Copyright © 2016 - 2017 Tomasz Pęczek</Copyright>
-    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Tomasz Pęczek</Authors>
-    <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Lib.AspNetCore.Mvc.JqGrid.Infrastructure</AssemblyName>
     <PackageId>Lib.AspNetCore.Mvc.JqGrid.Infrastructure</PackageId>
     <PackageTags>aspnetcore;aspnetcoremvc;jqgrid</PackageTags>

diff --git a/Lib.AspNetCore.Mvc.JqGrid.sln b/Lib.AspNetCore.Mvc.JqGrid.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.4
+VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib.AspNetCore.Mvc.JqGrid.Infrastructure", "Lib.AspNetCore.Mvc.JqGrid.Infrastructure\Lib.AspNetCore.Mvc.JqGrid.Infrastructure.csproj", "{548A56AB-8AAB-4582-AEA7-DB6403B0FA1F}"
 EndProject
@@ -11,7 +11,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib.AspNetCore.Mvc.JqGrid.D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib.AspNetCore.Mvc.JqGrid.Helper", "Lib.AspNetCore.Mvc.JqGrid.Helper\Lib.AspNetCore.Mvc.JqGrid.Helper.csproj", "{7FF4996A-D13C-4BAB-B7B5-4ED9396A2957}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocFx.AspNetCore.Mvc.JqGrid", "DocFx.AspNetCore.Mvc.JqGrid\DocFx.AspNetCore.Mvc.JqGrid.csproj", "{CAA68343-A1C3-4DD0-BBA7-0BF69DDF9A52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocFx.AspNetCore.Mvc.JqGrid", "DocFx.AspNetCore.Mvc.JqGrid\DocFx.AspNetCore.Mvc.JqGrid.csproj", "{CAA68343-A1C3-4DD0-BBA7-0BF69DDF9A52}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v1.x.y", "v1.x.y", "{A908E777-D5D2-4910-AFAF-ACEB152B51AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib.AspNetCore.Mvc.JqGrid.Infrastructure_v1.x.y", "v1.x.y\Lib.AspNetCore.Mvc.JqGrid.Infrastructure_v1.x.y\Lib.AspNetCore.Mvc.JqGrid.Infrastructure_v1.x.y.csproj", "{DC1FADB0-A047-4FB7-8ED8-971A33384C57}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib.AspNetCore.Mvc.JqGrid.Core_v1.x.y", "v1.x.y\Lib.AspNetCore.Mvc.JqGrid.Core_v1.x.y\Lib.AspNetCore.Mvc.JqGrid.Core_v1.x.y.csproj", "{886E7F59-9D47-4481-B803-EEA32FADE12B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib.AspNetCore.Mvc.JqGrid.DataAnnotations_v1.x.y", "v1.x.y\Lib.AspNetCore.Mvc.JqGrid.DataAnnotations_v1.x.y\Lib.AspNetCore.Mvc.JqGrid.DataAnnotations_v1.x.y.csproj", "{A65FCACA-397E-4108-93A1-04C949A4245D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib.AspNetCore.Mvc.JqGrid.Helper_v1.x.y", "v1.x.y\Lib.AspNetCore.Mvc.JqGrid.Helper_v1.x.y\Lib.AspNetCore.Mvc.JqGrid.Helper_v1.x.y.csproj", "{9D7249CD-7E4E-4CEE-A14A-29F38056AFCF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,8 +49,33 @@ Global
 		{CAA68343-A1C3-4DD0-BBA7-0BF69DDF9A52}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CAA68343-A1C3-4DD0-BBA7-0BF69DDF9A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CAA68343-A1C3-4DD0-BBA7-0BF69DDF9A52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC1FADB0-A047-4FB7-8ED8-971A33384C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC1FADB0-A047-4FB7-8ED8-971A33384C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC1FADB0-A047-4FB7-8ED8-971A33384C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC1FADB0-A047-4FB7-8ED8-971A33384C57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{886E7F59-9D47-4481-B803-EEA32FADE12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{886E7F59-9D47-4481-B803-EEA32FADE12B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{886E7F59-9D47-4481-B803-EEA32FADE12B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{886E7F59-9D47-4481-B803-EEA32FADE12B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A65FCACA-397E-4108-93A1-04C949A4245D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A65FCACA-397E-4108-93A1-04C949A4245D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A65FCACA-397E-4108-93A1-04C949A4245D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A65FCACA-397E-4108-93A1-04C949A4245D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D7249CD-7E4E-4CEE-A14A-29F38056AFCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D7249CD-7E4E-4CEE-A14A-29F38056AFCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D7249CD-7E4E-4CEE-A14A-29F38056AFCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D7249CD-7E4E-4CEE-A14A-29F38056AFCF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{DC1FADB0-A047-4FB7-8ED8-971A33384C57} = {A908E777-D5D2-4910-AFAF-ACEB152B51AF}
+		{886E7F59-9D47-4481-B803-EEA32FADE12B} = {A908E777-D5D2-4910-AFAF-ACEB152B51AF}
+		{A65FCACA-397E-4108-93A1-04C949A4245D} = {A908E777-D5D2-4910-AFAF-ACEB152B51AF}
+		{9D7249CD-7E4E-4CEE-A14A-29F38056AFCF} = {A908E777-D5D2-4910-AFAF-ACEB152B51AF}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7A78000F-C96C-4F99-B400-4C56EE6D8BB5}
+	EndGlobalSection
 EndGlobal