Added MVC projects; added some DBOs in Auth

.idea/.idea.luticate2/.idea/contentModel.xml

@@ -8,7 +8,30 @@
     <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p="Auth" t="Include" />
       <e p="Luticate2.Auth" t="IncludeRecursive">
+        <e p="Business" t="Include" />
         <e p="Class1.cs" t="Include" />
+        <e p="Dbo" t="Include">
+          <e p="Basic" t="Include">
+            <e p="LuAuthOptions.cs" t="Include" />
+          </e>
+          <e p="LuDboExtensions.cs" t="Include" />
+          <e p="Pagination" t="Include">
+            <e p="LuFilterDbo.cs" t="Include" />
+            <e p="LuOrderByDbo.cs" t="Include" />
+            <e p="LuOrderByFieldDbo.cs" t="Include" />
+            <e p="LuPaginatedDbo.cs" t="Include" />
+            <e p="LuPaginatedParamsDbo.cs" t="Include" />
+          </e>
+          <e p="Result" t="Include">
+            <e p="LuResult.cs" t="Include" />
+            <e p="LuStatus.cs" t="Include" />
+          </e>
+        </e>
+        <e p="Exceptions" t="Include">
+          <e p="LuExceptionsExtensions.cs" t="Include" />
+          <e p="LuResultException.cs" t="Include" />
+        </e>
+        <e p="Interfaces" t="Include" />
         <e p="Luticate2.Auth.csproj" t="IncludeRecursive" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
@@ -19,6 +42,18 @@
           </e>
         </e>
       </e>
+      <e p="Luticate2.Auth.ConsoleSample" t="IncludeRecursive">
+        <e p="Luticate2.Auth.ConsoleSample.csproj" t="IncludeRecursive" />
+        <e p="Program.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Luticate2.Auth.ConsoleSample.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+      </e>
       <e p="Luticate2.Auth.Tests" t="IncludeRecursive">
         <e p="Luticate2.Auth.Tests.csproj" t="IncludeRecursive" />
         <e p="UnitTest1.cs" t="Include" />
@@ -32,11 +67,36 @@
           </e>
         </e>
       </e>
-      <e p="Luticate2.Auth.WebApiSample" t="IncludeRecursive">
+      <e p="Luticate2.Mvc.Auth" t="IncludeRecursive">
+        <e p="Class1.cs" t="Include" />
+        <e p="Luticate2.Mvc.Auth.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netstandard2.0" t="Include">
+              <e p="Luticate2.Mvc.Auth.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+      </e>
+      <e p="Luticate2.Mvc.Auth.Tests" t="IncludeRecursive">
+        <e p="Luticate2.Mvc.Auth.Tests.csproj" t="IncludeRecursive" />
+        <e p="UnitTest1.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Luticate2.Mvc.Auth.Tests.AssemblyInfo.cs" t="Include" />
+              <e p="Luticate2.Mvc.Auth.Tests.Program.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+      </e>
+      <e p="Luticate2.Mvc.Auth.WebApiSample" t="IncludeRecursive">
         <e p="Controllers" t="Include">
           <e p="ValuesController.cs" t="Include" />
         </e>
-        <e p="Luticate2.Auth.WebApiSample.csproj" t="IncludeRecursive" />
+        <e p="Luticate2.Mvc.Auth.WebApiSample.csproj" t="IncludeRecursive" />
         <e p="Program.cs" t="Include" />
         <e p="Startup.cs" t="Include" />
         <e p="appsettings.Development.json" t="Include" />
@@ -45,12 +105,13 @@
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.0" t="Include">
-              <e p="Luticate2.Auth.WebApiSample.AssemblyInfo.cs" t="Include" />
+              <e p="Luticate2.Mvc.Auth.WebApiSample.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
         </e>
         <e p="wwwroot" t="Include" />
       </e>
+      <e p="Mvc.Auth" t="Include" />
       <e p="luticate2.sln" t="IncludeFlat" />
       <e p="packages" t="ExcludeRecursive" />
     </e>

Luticate2.Auth.ConsoleSample/Luticate2.Auth.ConsoleSample.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Luticate2.Auth\Luticate2.Auth.csproj" />
+  </ItemGroup>
+</Project>

Luticate2.Auth.ConsoleSample/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Luticate2.Auth.ConsoleSample
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine(Class1.Method1("Hello World!"));
+        }
+    }
+}

Luticate2.Auth/Dbo/Basic/LuAuthOptions.cs

@@ -0,0 +1,7 @@
+namespace Luticate2.Auth.Dbo.Basic
+{
+    public class LuAuthOptions
+    {
+        public string Version { get; set; }
+    }
+}

Luticate2.Auth/Dbo/LuDboExtensions.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Luticate2.Auth.Dbo.Pagination;
+using Luticate2.Auth.Dbo.Result;
+
+namespace Luticate2.Auth.Dbo
+{
+    public static class LuDboExtensions
+    {
+        public static int ToInt(this LuStatus status)
+        {
+            return (int) status;
+        }
+
+        // TODO?
+//        public static LuPaginatedDbo<TDbo> To<TDbo>(this LuPaginatedDbo<TDbo> data, Func<List<TDbo>, List<TDbo>> convert)
+//        {
+//            return new LuPaginatedDbo<TDbo>
+//            {
+//                Count = data.Count,
+//                Data = convert(data.Data)
+//            };
+//        }
+//
+//        public static LuPaginatedDbo<TDbo> Select<TDbo>(this LuPaginatedDbo<TDbo> data, Func<TDbo, TDbo> convert)
+//        {
+//            return new LuPaginatedDbo<TDbo>
+//            {
+//                Count = data.Count,
+//                Data = data.Data.Select(convert).ToList()
+//            };
+//        }
+    }
+}

Luticate2.Auth/Dbo/Pagination/LuFilterDbo.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+
+namespace Luticate2.Auth.Dbo.Pagination
+{
+    public class LuFilterDbo
+    {
+        public string Query { get; set; }
+
+        public IDictionary<string, string> Filters { get; set; }
+
+        public string GetFilterString(string key, string defaultValue)
+        {
+            if (!Filters.ContainsKey(key))
+            {
+                return defaultValue;
+            }
+            return Filters[key];
+        }
+
+        public bool? GetFilterBool(string key, bool? defaultValue)
+        {
+            var value = GetFilterString(key, "").ToLower();
+            if (value == "true")
+            {
+                return true;
+            }
+            if (value == "false")
+            {
+                return false;
+            }
+            return defaultValue;
+        }
+
+        public int? GetFilterInt(string key, int? defaultValue)
+        {
+            int v;
+            if (int.TryParse(GetFilterString(key, ""), out v))
+            {
+                return v;
+            }
+            return defaultValue;
+        }
+
+        public double? GetFilterFloat(string key, double? defaultValue)
+        {
+            double v;
+            if (double.TryParse(GetFilterString(key, ""), out v))
+            {
+                return v;
+            }
+            return defaultValue;
+        }
+    }
+}

Luticate2.Auth/Dbo/Pagination/LuOrderByDbo.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Luticate2.Auth.Dbo.Pagination
+{
+    public class LuOrderByDbo
+    {
+        public IList<LuOrderByFieldDbo> Fields { get; set; }
+    }
+}

Luticate2.Auth/Dbo/Pagination/LuOrderByFieldDbo.cs

@@ -0,0 +1,9 @@
+namespace Luticate2.Auth.Dbo.Pagination
+{
+    public class LuOrderByFieldDbo
+    {
+        public string Name { get; set; }
+
+        public bool Asc { get; set; }
+    }
+}

Luticate2.Auth/Dbo/Pagination/LuPaginatedDbo.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Luticate2.Auth.Dbo.Pagination
+{
+    public class LuPaginatedDbo<TDbo>
+    {
+        public long Count { get; set; }
+
+        public List<TDbo> Data { get; set; }
+    }
+}

Luticate2.Auth/Dbo/Pagination/LuPaginatedParamsDbo.cs

@@ -0,0 +1,13 @@
+namespace Luticate2.Auth.Dbo.Pagination
+{
+    public class LuPaginatedParamsDbo
+    {
+        public LuFilterDbo Filter { get; set; }
+
+        public LuOrderByDbo OrderBy { get; set; }
+
+        public int Page { get; set; }
+
+        public int PerPage { get; set; }
+    }
+}

Luticate2.Auth/Dbo/Result/LuResult.cs

@@ -0,0 +1,93 @@
+using System;
+
+namespace Luticate2.Auth.Dbo.Result
+{
+    public class LuResult<T>
+    {
+        public int Status { get; set; }
+
+        public bool Success => Status == LuStatus.Success.ToInt();
+
+        public string PublicDetails { get; set; }
+
+        public string PrivateDetails { get; set; }
+
+        public string StackTrace { get; set; }
+
+        public Exception Exception { get; set; }
+
+        public T Data { get; set; }
+
+        protected LuResult()
+        {
+        }
+
+        public static LuResult<T> Ok(T data)
+        {
+            return new LuResult<T>
+            {
+                StackTrace = new Exception().StackTrace,
+                Data = data,
+                Status = LuStatus.Success.ToInt()
+            };
+        }
+
+        public static LuResult<T> Error(int status, string privateDetails, string publicDetails = null)
+        {
+            return new LuResult<T>
+            {
+                PublicDetails = publicDetails == "" ? privateDetails : publicDetails,
+                PrivateDetails = privateDetails,
+                StackTrace = new Exception().StackTrace,
+                Status = status
+            };
+        }
+
+        public static LuResult<T> Error(int status, Exception e, string publicDetails = null)
+        {
+            return new LuResult<T>
+            {
+                PublicDetails = publicDetails,
+                PrivateDetails = e.ToString(),
+                StackTrace = new Exception().StackTrace,
+                Exception = e,
+                Status = status
+            };
+        }
+
+        public static LuResult<T> Error<T2>(LuResult<T2> other)
+        {
+            return new LuResult<T>
+            {
+                Status = other.Status,
+                PublicDetails = other.PublicDetails,
+                PrivateDetails = other.PrivateDetails,
+                StackTrace = other.StackTrace,
+                Exception = other.Exception
+            };
+        }
+
+        public LuResult<T2> To<T2>()
+        {
+            return LuResult<T2>.Error(this);
+        }
+
+        public LuResult<T2> To<T2>(Func<T, T2> convert)
+        {
+            return new LuResult<T2>
+            {
+                Data = Success ? convert(Data) : default(T2),
+                Status = Status,
+                PublicDetails = PublicDetails,
+                PrivateDetails = PrivateDetails,
+                StackTrace = StackTrace,
+                Exception = Exception
+            };
+        }
+
+        public static implicit operator bool(LuResult<T> res)
+        {
+            return res.Success;
+        }
+    }
+}

Luticate2.Auth/Dbo/Result/LuStatus.cs

@@ -0,0 +1,26 @@
+namespace Luticate2.Auth.Dbo.Result
+{
+    /// <summary>
+    /// Represents a success or error code used for <see cref="LuResult{T}"/>.
+    /// Codes strictly less than 1000 are reserved. Any other value can be used by user for custom error reporting.
+    /// </summary>
+    public enum LuStatus
+    {
+        // Success
+        Success = 1,
+        
+        // Generic errors
+        InternalError = 10,
+        InputError = 11,
+        NotFound = 12,
+        
+        // Backend errors
+        BackendError = 20,
+        DbError = 21,
+        FsError = 22,
+        
+        // Auth errors
+        LoginError = 30,
+        PermissionError = 31
+    }
+}

Luticate2.Auth/Exceptions/LuExceptionsExtensions.cs

@@ -0,0 +1,21 @@
+using Luticate2.Auth.Dbo.Result;
+
+namespace Luticate2.Auth.Exceptions
+{
+    public static class LuExceptionsExtensions
+    {
+        public static void Throw<T>(this LuResult<T> result)
+        {
+            throw new LuResultException(result.To<object>());
+        }
+
+        public static LuResult<T> ThrowIfNotSuccess<T>(this LuResult<T> result)
+        {
+            if (!result)
+            {
+                result.Throw();
+            }
+            return result;
+        }
+    }
+}

Luticate2.Auth/Exceptions/LuResultException.cs

@@ -0,0 +1,15 @@
+using System;
+using Luticate2.Auth.Dbo.Result;
+
+namespace Luticate2.Auth.Exceptions
+{
+    public class LuResultException : Exception
+    {
+        public LuResult<object> Result { get; set; }
+
+        public LuResultException(LuResult<object> result) : base(result.PrivateDetails, result.Exception)
+        {
+            Result = result;
+        }
+    }
+}

Luticate2.Auth/Luticate2.Auth.csproj

@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-    </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="Business" />
+    <Folder Include="Interfaces" />
+  </ItemGroup>
+</Project>

Luticate2.Mvc.Auth.Tests/Luticate2.Mvc.Auth.Tests.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Luticate2.Mvc.Auth\Luticate2.Mvc.Auth.csproj" />
+  </ItemGroup>
+</Project>

Luticate2.Mvc.Auth.Tests/UnitTest1.cs

@@ -0,0 +1,16 @@
+using System;
+using Xunit;
+
+namespace Luticate2.Mvc.Auth.Tests
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+            string expected = "testValue 0";
+            string actual = Class1.Method1("0");
+            Assert.Equal(expected, actual);
+        }
+    }
+}

Luticate2.Mvc.Auth.WebApiSample/Controllers/ValuesController.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Luticate2.Mvc.Auth.WebApiSample.Controllers
+{
+    [Route("api/[controller]")]
+    public class ValuesController : Controller
+    {
+        // GET api/values
+        [HttpGet]
+        public IEnumerable<string> Get()
+        {
+            return new string[] {Class1.Method1("value1"), Class1.Method1("value2")};
+        }
+
+        // GET api/values/5
+        [HttpGet("{id}")]
+        public string Get(int id)
+        {
+            return "value";
+        }
+
+        // POST api/values
+        [HttpPost]
+        public void Post([FromBody] string value)
+        {
+        }
+
+        // PUT api/values/5
+        [HttpPut("{id}")]
+        public void Put(int id, [FromBody] string value)
+        {
+        }
+
+        // DELETE api/values/5
+        [HttpDelete("{id}")]
+        public void Delete(int id)
+        {
+        }
+    }
+}

Luticate2.Mvc.Auth.WebApiSample/Luticate2.Mvc.Auth.WebApiSample.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
+  </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Luticate2.Mvc.Auth\Luticate2.Mvc.Auth.csproj" />
+  </ItemGroup>
+</Project>

Luticate2.Mvc.Auth.WebApiSample/Program.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace Luticate2.Mvc.Auth.WebApiSample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            BuildWebHost(args).Run();
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>()
+                .Build();
+    }
+}

Luticate2.Mvc.Auth.WebApiSample/Startup.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Luticate2.Mvc.Auth.WebApiSample
+{
+    public class Startup
+    {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc();
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseMvc();
+        }
+    }
+}

Luticate2.Mvc.Auth.WebApiSample/appsettings.Development.json

@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}

Luticate2.Mvc.Auth.WebApiSample/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "Debug": {
+      "LogLevel": {
+        "Default": "Warning"
+      }
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Warning"
+      }
+    }
+  }
+}

Luticate2.Mvc.Auth/Class1.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Luticate2.Mvc.Auth
+{
+    public class Class1
+    {
+        public static string Method1(string arg1)
+        {
+            return $"testValue {arg1}";
+        }
+    }
+}

Luticate2.Mvc.Auth/Luticate2.Mvc.Auth.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+</Project>

luticate2.sln

@@ -6,7 +6,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Auth", "Luticate2
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Auth.Tests", "Luticate2.Auth.Tests\Luticate2.Auth.Tests.csproj", "{82A268E9-361D-4F4A-B3A9-3810C5275587}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Auth.WebApiSample", "Luticate2.Auth.WebApiSample\Luticate2.Auth.WebApiSample.csproj", "{0621B806-7B96-4C0B-BA14-F98E6ECCB322}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Auth", "Mvc.Auth", "{ACF46E3B-F5EF-4A04-85B9-B2EAE6E1797D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Mvc.Auth", "Luticate2.Mvc.Auth\Luticate2.Mvc.Auth.csproj", "{33168D59-7191-42C2-8774-0B45BBF4C10A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Mvc.Auth.Tests", "Luticate2.Mvc.Auth.Tests\Luticate2.Mvc.Auth.Tests.csproj", "{AD7E43AA-2AEF-469C-A30C-0144A92E6CE6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Auth.ConsoleSample", "Luticate2.Auth.ConsoleSample\Luticate2.Auth.ConsoleSample.csproj", "{65809E11-3C5B-4641-9710-E8EEF47A72E1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luticate2.Mvc.Auth.WebApiSample", "Luticate2.Mvc.Auth.WebApiSample\Luticate2.Mvc.Auth.WebApiSample.csproj", "{E5FB71F0-F91B-427B-BA91-27B274BC077D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,7 +24,10 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{11727D2F-E2EE-4FD5-BEC4-C22B5B0D38A2} = {A9D48433-4DD9-4CEC-89FA-0350C942EFC9}
 		{82A268E9-361D-4F4A-B3A9-3810C5275587} = {A9D48433-4DD9-4CEC-89FA-0350C942EFC9}
-		{0621B806-7B96-4C0B-BA14-F98E6ECCB322} = {A9D48433-4DD9-4CEC-89FA-0350C942EFC9}
+		{33168D59-7191-42C2-8774-0B45BBF4C10A} = {ACF46E3B-F5EF-4A04-85B9-B2EAE6E1797D}
+		{AD7E43AA-2AEF-469C-A30C-0144A92E6CE6} = {ACF46E3B-F5EF-4A04-85B9-B2EAE6E1797D}
+		{65809E11-3C5B-4641-9710-E8EEF47A72E1} = {A9D48433-4DD9-4CEC-89FA-0350C942EFC9}
+		{E5FB71F0-F91B-427B-BA91-27B274BC077D} = {ACF46E3B-F5EF-4A04-85B9-B2EAE6E1797D}
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{11727D2F-E2EE-4FD5-BEC4-C22B5B0D38A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -27,9 +38,21 @@ Global
 		{82A268E9-361D-4F4A-B3A9-3810C5275587}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82A268E9-361D-4F4A-B3A9-3810C5275587}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82A268E9-361D-4F4A-B3A9-3810C5275587}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0621B806-7B96-4C0B-BA14-F98E6ECCB322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0621B806-7B96-4C0B-BA14-F98E6ECCB322}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0621B806-7B96-4C0B-BA14-F98E6ECCB322}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0621B806-7B96-4C0B-BA14-F98E6ECCB322}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33168D59-7191-42C2-8774-0B45BBF4C10A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33168D59-7191-42C2-8774-0B45BBF4C10A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33168D59-7191-42C2-8774-0B45BBF4C10A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33168D59-7191-42C2-8774-0B45BBF4C10A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD7E43AA-2AEF-469C-A30C-0144A92E6CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD7E43AA-2AEF-469C-A30C-0144A92E6CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD7E43AA-2AEF-469C-A30C-0144A92E6CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD7E43AA-2AEF-469C-A30C-0144A92E6CE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65809E11-3C5B-4641-9710-E8EEF47A72E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65809E11-3C5B-4641-9710-E8EEF47A72E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65809E11-3C5B-4641-9710-E8EEF47A72E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65809E11-3C5B-4641-9710-E8EEF47A72E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5FB71F0-F91B-427B-BA91-27B274BC077D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5FB71F0-F91B-427B-BA91-27B274BC077D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5FB71F0-F91B-427B-BA91-27B274BC077D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5FB71F0-F91B-427B-BA91-27B274BC077D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal