Merge commit '47cbdc21c1bf95d78f86760bf6ec85dab0ee4774'

OptixServe.Api/Configuration/AppSettings.cs

@@ -1,15 +1,16 @@
 namespace OptixServe.Api.Configuration;
 
-public record ApiConfiguration
+public record OptixServeSettings
 {
     public ApiSettings? Api { get; set; } = new();
+    public DatabaseSettings? Database { get; set; } = new();
     public JwtSettings? Jwt { get; set; } = new();
 }
 
 public record ApiSettings
 {
-    public string? Listen { get; set; }
+    public string? Listen { get; set; } = "127.0.0.1";
-    public int? Port { get; set; }
+    public int? Port { get; set; } = 10086;
 }
 
 public record JwtSettings
@@ -19,3 +20,15 @@ public record JwtSettings
     public string Audience { get; set; } = "OptixServeUsers";
     public int TokenExpirationMinutes { get; set; } = 60;
 }
+
+public enum DatabaseType
+{
+    Sqlite,
+    MySQL
+}
+
+public record DatabaseSettings
+{
+    public DatabaseType Type { get; set; } = DatabaseType.Sqlite;
+    public string? Host { get; set; }
+}

OptixServe.Api/Configuration/ConfigurationHelper.cs

@@ -1,18 +1,18 @@
-using Microsoft.Extensions.Configuration;
+using System;
 
-namespace OptixServe.Infrastructure.Configuration;
+namespace OptixServe.Api.Configuration;
 
 public static class ConfigurationHelper
 {
-    public static IConfigurationBuilder CreateDefaultBuilder(string basePath)
+    public static IConfigurationBuilder CreateDefaultBuilder()
     {
         var aspEnv = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
         var netEnv = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
+        // Console.WriteLine($"ASPNETCORE_ENVIRONMENT: {aspEnv}, DOTNET_ENVIRONMENT: {netEnv}");
         var env = aspEnv ?? netEnv ?? null;
 
         var builder = new ConfigurationBuilder()
-            // .SetBasePath(Directory.GetCurrentDirectory())
+            .SetBasePath(Directory.GetCurrentDirectory())
-            .SetBasePath(basePath)
             .AddJsonFile("appsettings.json", optional: true)
             .AddJsonFile("config.json", optional: true);
         
@@ -24,9 +24,4 @@ public static class ConfigurationHelper
 
         return builder;
     }
-
+}
-    public static IConfigurationBuilder CreateDefaultBuilder()
-    {
-        return CreateDefaultBuilder(Directory.GetCurrentDirectory());
-    }
-}

OptixServe.Api/Endpoints/UserEndpoint.cs

@@ -1,7 +1,8 @@
 using System.Text.Json.Serialization;
-using OptixServe.Application.Services;
+using OptixServe.Core.Services;
 using OptixServe.Api.Dtos;
 using OptixServe.Api.Services;
+using Microsoft.AspNetCore.Authorization;
 
 namespace OptixServe.Api.Endpoints;
 
@@ -9,7 +10,7 @@ namespace OptixServe.Api.Endpoints;
 [JsonSerializable(typeof(UserDto))]
 [JsonSerializable(typeof(IEnumerable<UserDto>))]
 [JsonSerializable(typeof(LoginRequestDto))]
-[JsonSerializable(typeof(LoginResponseDto))]
+[JsonSerializable(typeof(LoginResponseDto))] // For returning the token string
 public partial class UserJsonContext : JsonSerializerContext { }
 
 public static class UserEndpoint

OptixServe.Api/Endpoints/VersionEndpoint.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Options;
-using OptixServe.Infrastructure.Configuration;
+using OptixServe.Api.Configuration;
 using OptixServe.Api.Dtos;
 
 namespace OptixServe.Api.Endpoints;
@@ -22,14 +22,14 @@ public static class VersionEndpoint
         var group = parentGroup.MapGroup("/version");
 
         group.MapGet("/", () => "v1");
-        group.MapGet("/test/dbconfig", (IOptions<InfrastructureConfiguration> infrastructureConfig) =>
+        group.MapGet("/test/dbconfig", (IOptions<OptixServeSettings> appSettings) =>
         {
-            var dbType = infrastructureConfig.Value.Database?.Type;
+            var dbType = appSettings.Value.Database?.Type;
-            var dbHost = infrastructureConfig.Value.Database?.Host;
+            var dbHost = appSettings.Value.Database?.Host;
             return Results.Ok(new CommonErrorDto
             {
                 Message = $"Set up {dbType} database on {dbHost}"
             });
         });
     }
-}
+}

OptixServe.Api/OptixServe.Api.csproj

@@ -2,13 +2,16 @@
 
   <ItemGroup>
     <ProjectReference Include="..\OptixServe.Core\OptixServe.Core.csproj" />
-    <ProjectReference Include="..\OptixServe.Application\OptixServe.Application.csproj" />
-    <ProjectReference Include="..\OptixServe.Infrastructure\OptixServe.Infrastructure.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.6" />
   </ItemGroup>
 
   <PropertyGroup>

OptixServe.Api/Program.cs

@@ -5,10 +5,9 @@ using Microsoft.IdentityModel.Tokens;
 using OptixServe.Api.Configuration;
 using OptixServe.Api.Endpoints;
 using OptixServe.Api.Services;
-using OptixServe.Application.Services;
+using OptixServe.Core.Data;
-using OptixServe.Infrastructure.Configuration;
+using OptixServe.Core.Services;
-using OptixServe.Infrastructure.Data;
+using OptixServe.Api.Utilites;
-using OptixServe.Infrastructure.Utilites;
 
 class Program
 {
@@ -90,7 +89,12 @@ static class StartupHelper
     public static void AddConfigurationWithCommand(this WebApplicationBuilder builder, FileInfo? file)
     {
         // Configure configuration sources in specified order
-        var configurationBuilder = ConfigurationHelper.CreateDefaultBuilder();
+        var configurationBuilder = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: true)
+            .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true)
+            .AddJsonFile("config.json", optional: true)
+            .AddJsonFile($"config.{builder.Environment.EnvironmentName}.json", optional: true);
 
         // Add command-line specified config file if provided
         if (file != null)
@@ -119,17 +123,13 @@ static class StartupHelper
     /// <param name="builder">WebApplicationBuilder instance</param>
     public static void RegisterServices(this WebApplicationBuilder builder)
     {
-        // Add configuration classes
+        // Add configuration class
-        var apiConfigSection = builder.Configuration.GetSection("OptixServe:Api");
+        var optixSettigns = builder.Configuration.GetSection("OptixServe");
-        builder.Services.Configure<ApiConfiguration>(apiConfigSection);
+        var onConfigSettings = optixSettigns.Get<OptixServeSettings>();
-        var apiConfig = apiConfigSection.Get<ApiConfiguration>();
+        builder.Services.Configure<OptixServeSettings>(optixSettigns);
-
-        var infraConfigSection = builder.Configuration.GetSection("OptixServe:Infrastructure");
-        builder.Services.Configure<InfrastructureConfiguration>(infraConfigSection);
-        var infraConfig = infraConfigSection.Get<InfrastructureConfiguration>();
 
         // Add DBContext class
-        builder.Services.AddAppDatabase(infraConfig?.Database!);
+        builder.Services.AddAppDatabase(onConfigSettings?.Database!);
         builder.Services.AddScoped<DbInitializer>();
 
         // Application services
@@ -140,7 +140,7 @@ static class StartupHelper
         builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             .AddJwtBearer(options =>
             {
-                var jwtSettings = apiConfig?.Jwt ?? throw new ArgumentNullException(nameof(builder), "JWT settings are not configured.");
+                var jwtSettings = onConfigSettings?.Jwt ?? throw new ArgumentNullException(nameof(builder), "JWT settings are not configured.");
                 options.TokenValidationParameters = new TokenValidationParameters
                 {
                     ValidateIssuer = true,
@@ -178,4 +178,4 @@ static class StartupHelper
         VersionEndpoint.Register(rootGroup);
     }
 
-}
+}

OptixServe.Api/Services/TokenService.cs

@@ -13,9 +13,9 @@ public interface ITokenService
     public string GenerateToken(User user);
 }
 
-public class TokenService(IOptions<ApiConfiguration> apiConfiguration) : ITokenService
+public class TokenService(IOptions<OptixServeSettings> optixServeSettings) : ITokenService
 {
-    private readonly JwtSettings _jwtSettings = apiConfiguration.Value.Jwt ?? throw new ArgumentNullException(nameof(apiConfiguration), "JWT settings are not configured.");
+    private readonly JwtSettings _jwtSettings = optixServeSettings.Value.Jwt ?? throw new ArgumentNullException(nameof(optixServeSettings), "JWT settings are not configured.");
 
     public string GenerateToken(User user)
     {
@@ -41,4 +41,4 @@ public class TokenService(IOptions<ApiConfiguration> apiConfiguration) : ITokenS
         var token = tokenHandler.CreateToken(tokenDescriptor);
         return tokenHandler.WriteToken(token);
     }
-}
+}

OptixServe.Api/Utilites/DatabaseHelper.cs

@@ -1,7 +1,8 @@
 using Microsoft.EntityFrameworkCore;
-using OptixServe.Infrastructure.Configuration;
+using OptixServe.Api.Configuration;
+using OptixServe.Core.Data;
 
-namespace OptixServe.Infrastructure.Utilites;
+namespace OptixServe.Api.Utilites;
 
 public static class DatabaseHelper
 {
@@ -22,7 +23,7 @@ public static class DatabaseHelper
             var dbPath = dbSettings.Host ?? "optixserve.db";
             var connectionString = $"Data Source={dbPath}";
 
-            options.UseSqlite(connectionString, b => b.MigrationsAssembly("OptixServe.Infrastructure"));
+            options.UseSqlite(connectionString, b => b.MigrationsAssembly("OptixServe.Api"));
 
         }
         else
@@ -30,4 +31,4 @@ public static class DatabaseHelper
             throw new NotImplementedException("Only SQLite database is currently supported");
         }
     }
-}
+}

OptixServe.Api/Utilites/DesignTimeDbContextFactory.cs

@@ -0,0 +1,20 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using OptixServe.Api.Configuration;
+using OptixServe.Core.Data;
+
+namespace OptixServe.Api.Utilites;
+
+public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<AppDbContext>
+{
+    public AppDbContext CreateDbContext(string[] args)
+    {
+        var configuration = ConfigurationHelper.CreateDefaultBuilder().Build();
+
+        var dbSettings = configuration.GetSection("OptixServe:Database").Get<DatabaseSettings>()!;
+        var optionsBuilder = new DbContextOptionsBuilder<AppDbContext>();
+        DatabaseHelper.ConfigureDbContext(optionsBuilder, dbSettings);
+
+        return new AppDbContext(optionsBuilder.Options);
+    }
+}

OptixServe.Api/appsettings.json

@@ -9,19 +9,17 @@
   "OptixServe": {
     "Api": {
       "Listen": "0.0.0.0",
-      "Port": "54321",
+      "Port": "54321"
-      "Jwt": {
-        "Secret": "YOUR_SECRET_KEY_HERE_DO_NOT_SHARE_THIS_AND_MAKE_IT_LONG_ENOUGH",
-        "Issuer": "OptixServe",
-        "Audience": "OptixServeUsers",
-        "TokenExpirationMinutes": 60
-      }
     },
-    "Infrastructure": {
+    "Database": {
-      "Database": {
+      "Type": "Sqlite",
-        "Type": "Sqlite",
+      "Host": "optixserve.db"
-        "Host": "optixserve.db"
+    },
-      }
+    "Jwt": {
+      "Secret": "YOUR_SECRET_KEY_HERE_DO_NOT_SHARE_THIS_AND_MAKE_IT_LONG_ENOUGH",
+      "Issuer": "OptixServe",
+      "Audience": "OptixServeUsers",
+      "TokenExpirationMinutes": 60
     }
   }
-}
+}

OptixServe.Application/OptixServe.Application.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\OptixServe.Core\OptixServe.Core.csproj" />
-    <ProjectReference Include="..\OptixServe.Infrastructure\OptixServe.Infrastructure.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>

OptixServe.Core/Data/AppDbContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using OptixServe.Core.Models;
 
-namespace OptixServe.Infrastructure.Data;
+namespace OptixServe.Core.Data;
 
 public class AppDbContext(DbContextOptions options) : DbContext(options)
 {
@@ -18,4 +18,4 @@ public class AppDbContext(DbContextOptions options) : DbContext(options)
             new() {Id = "1", UserName = "admin", Password = "admin12345"}
         ]);
     }
-}
+}

OptixServe.Core/Data/DbInitializer.cs

@@ -1,4 +1,4 @@
-namespace OptixServe.Infrastructure.Data;
+namespace OptixServe.Core.Data;
 
 public class DbInitializer(AppDbContext dbContext)
 {
@@ -8,4 +8,4 @@ public class DbInitializer(AppDbContext dbContext)
     {
         _context.Database.EnsureCreated();
     }
-}
+}

OptixServe.Core/OptixServe.Core.csproj

@@ -6,5 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
+  </ItemGroup>
 
 </Project>

OptixServe.Core/Services/UserService.cs

@@ -1,7 +1,7 @@
+using OptixServe.Core.Data;
 using OptixServe.Core.Models;
-using OptixServe.Infrastructure.Data;
 
-namespace OptixServe.Application.Services;
+namespace OptixServe.Core.Services;
 
 public interface IUserService
 {
@@ -28,4 +28,4 @@ public class UserService(AppDbContext dbContext) : IUserService
     {
         return _dbContext.Users.AsEnumerable();
     }
-}
+}

OptixServe.Infrastructure/Configuration/InfrastructureConfiguration.cs

@@ -1,18 +0,0 @@
-namespace OptixServe.Infrastructure.Configuration;
-
-public record InfrastructureConfiguration
-{
-    public DatabaseSettings? Database { get; set; } = new();
-}
-
-public enum DatabaseType
-{
-    Sqlite,
-    MySQL
-}
-
-public record DatabaseSettings
-{
-    public DatabaseType Type { get; set; } = DatabaseType.Sqlite;
-    public string? Host { get; set; }
-}

OptixServe.Infrastructure/Migrations/.gitignore

@@ -1,2 +0,0 @@
-# Migrations are ignored in development
-*.cs

OptixServe.Infrastructure/OptixServe.Infrastructure.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\OptixServe.Core\OptixServe.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>

OptixServe.Infrastructure/Utilites/DesignTimeDbContextFactory.cs

@@ -1,129 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Microsoft.Extensions.Configuration;
-using OptixServe.Infrastructure.Configuration;
-using OptixServe.Infrastructure.Data;
-
-namespace OptixServe.Infrastructure.Utilites;
-
-public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<AppDbContext>
-{
-    private record CommandParseResult
-    {
-        public string? ConfigPath { get; set; } = null;
-        public string? DataDir { get; set; } = null;
-    }
-
-    private static CommandParseResult ParseArgs(string[] args)
-    {
-        var result = new CommandParseResult();
-        bool configSet = false;
-        bool dataDirSet = false;
-
-        for (int i = 0; i < args.Length; i++)
-        {
-            string arg = args[i];
-
-            if (arg == "--config" || arg == "-c")
-            {
-                if (configSet)
-                {
-                    throw new ArgumentException("The --config/-c option can only be specified once.");
-                }
-                if (i + 1 >= args.Length)
-                {
-                    throw new ArgumentException("Missing value for --config/-c option.");
-                }
-
-                result.ConfigPath = args[i + 1];
-                configSet = true;
-                i++;
-            }
-            else if (arg == "--data-dir" || arg == "-d")
-            {
-                if (dataDirSet)
-                {
-                    throw new ArgumentException("The --data-dir/-d option can only be specified once.");
-                }
-                if (i + 1 >= args.Length)
-                {
-                    throw new ArgumentException("Missing value for --data-dir/-d option.");
-                }
-
-                result.DataDir = args[i + 1];
-                dataDirSet = true;
-                i++;
-            }
-            else
-            {
-                throw new ArgumentException($"Unknown argument: {arg}");
-            }
-        }
-
-        return result;
-    }
-
-    /// <summary>
-    /// Creates DbContext instance in Design-Time
-    /// 
-    /// <para>Custom arguments should be passed in <i>dotnet</i> command </para>
-    /// 
-    /// <b>Example:</b><br/>
-    /// <example><c>dotnet ef database update -- -c ../data/appsettings.Development.json -d ../data/`</c></example>
-    /// 
-    /// </summary>
-    /// <param name="args">
-    ///     <list type="bullet">
-    ///         <item>
-    ///             --config/-c: App configuration file to load with database connection settings.
-    ///         </item>
-    ///         <item>
-    ///             --data-dir/-d: App data dir to work with.
-    ///             Currently this only affects finding SQLite database when relative path
-    ///             is specified in database settings.
-    ///         </item>
-    ///     </list>
-    /// </param>
-    /// <returns></returns>
-    public AppDbContext CreateDbContext(string[] args)
-    {
-        var parsedArgs = ParseArgs(args);
-
-        IConfigurationRoot configuration;
-
-        if (!string.IsNullOrEmpty(parsedArgs.ConfigPath))
-        {
-            var absConfigPath = Path.GetFullPath(parsedArgs.ConfigPath);
-            var configDirectory = Path.GetDirectoryName(absConfigPath);
-            var configFileName = Path.GetFileName(absConfigPath);
-            // Use the provided config file path
-            configuration = new ConfigurationBuilder()
-                .SetBasePath(configDirectory ?? "")
-                .AddJsonFile(configFileName, optional: false)
-                .Build();
-        }
-        else
-        {
-            // Default search configuration path
-            configuration = ConfigurationHelper.CreateDefaultBuilder().Build();
-        }
-
-        var dbSettings = configuration.GetSection("OptixServe:Infrastructure:Database").Get<DatabaseSettings>()!;
-
-        // Resolve SQLite database if `--data-dir` is specified and `dbSettings.Host` is relative
-        if (parsedArgs.DataDir != null)
-        {
-            if (dbSettings.Type == DatabaseType.Sqlite && !Path.IsPathFullyQualified(dbSettings.Host!))
-            {
-                var dbRelPath = Path.Combine(parsedArgs.DataDir, dbSettings.Host!);
-                var dbAbsPath = Path.GetFullPath(dbRelPath);
-                dbSettings.Host = dbAbsPath;
-            }
-        }
-
-        var optionsBuilder = new DbContextOptionsBuilder<AppDbContext>();
-        DatabaseHelper.ConfigureDbContext(optionsBuilder, dbSettings);
-
-        return new AppDbContext(optionsBuilder.Options);
-    }
-}

OptixServe.sln

@@ -7,10 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptixServe.Core", "OptixSer
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptixServe.Api", "OptixServe.Api\OptixServe.Api.csproj", "{52559B29-A255-4BDC-8F2B-A984DEE69E7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptixServe.Infrastructure", "OptixServe.Infrastructure\OptixServe.Infrastructure.csproj", "{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptixServe.Application", "OptixServe.Application\OptixServe.Application.csproj", "{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,30 +41,6 @@ Global
 		{52559B29-A255-4BDC-8F2B-A984DEE69E7E}.Release|x64.Build.0 = Release|Any CPU
 		{52559B29-A255-4BDC-8F2B-A984DEE69E7E}.Release|x86.ActiveCfg = Release|Any CPU
 		{52559B29-A255-4BDC-8F2B-A984DEE69E7E}.Release|x86.Build.0 = Release|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Debug|x64.Build.0 = Debug|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Debug|x86.Build.0 = Debug|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Release|x64.ActiveCfg = Release|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Release|x64.Build.0 = Release|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Release|x86.ActiveCfg = Release|Any CPU
-		{E90B4BE9-BCE3-48AC-B60E-1ADF2D328408}.Release|x86.Build.0 = Release|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Debug|x64.Build.0 = Debug|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Debug|x86.Build.0 = Debug|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Release|x64.ActiveCfg = Release|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Release|x64.Build.0 = Release|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Release|x86.ActiveCfg = Release|Any CPU
-		{71D84B31-775B-4EF8-9D0B-411A8CE1CC3A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE