Project refactor

This commit is contained in:
2022-01-07 18:46:56 +01:00
parent 9956fb4c26
commit a0c28eb749
10 changed files with 199 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
namespace FileTime.ConsoleUI.App.Command namespace FileTime.App.Core.Command
{ {
public enum Commands public enum Commands
{ {

View File

@@ -1,13 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Core\FileTime.Core\FileTime.Core.csproj"/> <ProjectReference Include="..\..\Core\FileTime.Core\FileTime.Core.csproj"/>
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View File

@@ -0,0 +1,24 @@
using FileTime.App.Core.Clipboard;
using FileTime.Core.Command;
using FileTime.Core.Providers;
using FileTime.Core.StateManagement;
using FileTime.Providers.Local;
using Microsoft.Extensions.DependencyInjection;
namespace FileTime.App.Core
{
public static class DependencyInjection
{
public static IServiceCollection RegisterDefaultServices(IServiceCollection? serviceCollection = null)
{
serviceCollection ??= new ServiceCollection();
return serviceCollection
.AddSingleton<IClipboard, Clipboard.Clipboard>()
.AddSingleton<LocalContentProvider>()
.AddSingleton<IContentProvider, LocalContentProvider>(sp => sp.GetService<LocalContentProvider>() ?? throw new Exception($"No {nameof(LocalContentProvider)} instance found"))
.AddSingleton<ElementCreationStates>()
.AddSingleton<CommandExecutor>();
}
}
}

View File

@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FileTime.App.Core\FileTime.App.Core.csproj" />
<ProjectReference Include="..\..\Providers\FileTime.Providers.Local\FileTime.Providers.Local.csproj" />
</ItemGroup>
</Project>

View File

@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
using FileTime.App.Core.Tab; using FileTime.App.Core.Tab;
using FileTime.ConsoleUI.App.UI.Color; using FileTime.ConsoleUI.App.UI.Color;
using FileTime.Core.Command; using FileTime.Core.Command;
using FileTime.App.Core.Command;
namespace FileTime.ConsoleUI.App namespace FileTime.ConsoleUI.App
{ {

View File

@@ -1,3 +1,5 @@
using FileTime.App.Core.Command;
namespace FileTime.ConsoleUI.App.Command namespace FileTime.ConsoleUI.App.Command
{ {
public class CommandBinding public class CommandBinding

View File

@@ -5,6 +5,7 @@
<ProjectReference Include="..\FileTime.ConsoleUI.App\FileTime.ConsoleUI.App.csproj" /> <ProjectReference Include="..\FileTime.ConsoleUI.App\FileTime.ConsoleUI.App.csproj" />
<ProjectReference Include="..\..\AppCommon\FileTime.App.Core\FileTime.App.Core.csproj" /> <ProjectReference Include="..\..\AppCommon\FileTime.App.Core\FileTime.App.Core.csproj" />
<ProjectReference Include="..\..\AppCommon\FileTime.App.Style\FileTime.App.Style.csproj" /> <ProjectReference Include="..\..\AppCommon\FileTime.App.Style\FileTime.App.Style.csproj" />
<ProjectReference Include="..\..\AppCommon\FileTime.App.DependencyInjection\FileTime.App.DependencyInjection.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />

View File

@@ -1,4 +1,5 @@
using FileTime.App.Core.Clipboard; using FileTime.App.Core;
using FileTime.App.Core.Clipboard;
using FileTime.ConsoleUI.App; using FileTime.ConsoleUI.App;
using FileTime.ConsoleUI.App.UI; using FileTime.ConsoleUI.App.UI;
using FileTime.ConsoleUI.App.UI.Color; using FileTime.ConsoleUI.App.UI.Color;
@@ -99,17 +100,14 @@ namespace FileTime.ConsoleUI
private static ServiceProvider CreateServiceProvider() private static ServiceProvider CreateServiceProvider()
{ {
return new ServiceCollection() return DependencyInjection.RegisterDefaultServices()
.AddLogging(/* (builder) => builder.AddConsole().AddDebug() */) .AddLogging(/* (builder) => builder.AddConsole().AddDebug() */)
.AddSingleton<Application>() .AddSingleton<Application>()
.AddSingleton<IStyles>(new Styles(IsAnsiColorSupported())) .AddSingleton<IStyles>(new Styles(IsAnsiColorSupported()))
.AddSingleton<IColoredConsoleRenderer, ColoredConsoleRenderer>() .AddSingleton<IColoredConsoleRenderer, ColoredConsoleRenderer>()
.AddSingleton<IClipboard, Clipboard>()
.AddSingleton<LocalContentProvider>()
.AddSingleton<IContentProvider, LocalContentProvider>(sp => sp.GetService<LocalContentProvider>() ?? throw new Exception($"No {nameof(LocalContentProvider)} instance found"))
.AddSingleton<ElementCreationStates>()
.AddSingleton<CommandExecutor>()
.AddSingleton<ConsoleReader>() .AddSingleton<ConsoleReader>()
.AddTransient<Render>() .AddTransient<Render>()
.RegisterCommandHandlers() .RegisterCommandHandlers()
.BuildServiceProvider(); .BuildServiceProvider();

View File

@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\..\AppCommon\FileTime.App.Style\FileTime.App.Style.csproj" />
</ItemGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>

View File

@@ -25,40 +25,182 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppCommon", "AppCommon", "{
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{38B1B927-4201-4B7A-87EE-737B8C6D4090}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{38B1B927-4201-4B7A-87EE-737B8C6D4090}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileTime.App.DependencyInjection", "AppCommon\FileTime.App.DependencyInjection\FileTime.App.DependencyInjection.csproj", "{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|ARM.Build.0 = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|ARM64.Build.0 = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|x64.ActiveCfg = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|x64.Build.0 = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|x86.ActiveCfg = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Debug|x86.Build.0 = Debug|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|Any CPU.Build.0 = Release|Any CPU {F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|Any CPU.Build.0 = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|ARM.ActiveCfg = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|ARM.Build.0 = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|ARM64.ActiveCfg = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|ARM64.Build.0 = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|x64.ActiveCfg = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|x64.Build.0 = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|x86.ActiveCfg = Release|Any CPU
{F5C58BDC-BDCE-47B8-9371-70DB815E9B0E}.Release|x86.Build.0 = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|ARM.ActiveCfg = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|ARM.Build.0 = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|ARM64.Build.0 = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|x64.ActiveCfg = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|x64.Build.0 = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|x86.ActiveCfg = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Debug|x86.Build.0 = Debug|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|Any CPU.Build.0 = Release|Any CPU {EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|Any CPU.Build.0 = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|ARM.ActiveCfg = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|ARM.Build.0 = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|ARM64.ActiveCfg = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|ARM64.Build.0 = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|x64.ActiveCfg = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|x64.Build.0 = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|x86.ActiveCfg = Release|Any CPU
{EC1F7FC4-5600-4953-A85A-534CA43601C3}.Release|x86.Build.0 = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|Any CPU.Build.0 = Debug|Any CPU {A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|ARM.ActiveCfg = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|ARM.Build.0 = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|ARM64.Build.0 = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|x64.ActiveCfg = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|x64.Build.0 = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|x86.ActiveCfg = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Debug|x86.Build.0 = Debug|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|Any CPU.ActiveCfg = Release|Any CPU {A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|Any CPU.Build.0 = Release|Any CPU {A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|Any CPU.Build.0 = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|ARM.ActiveCfg = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|ARM.Build.0 = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|ARM64.ActiveCfg = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|ARM64.Build.0 = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|x64.ActiveCfg = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|x64.Build.0 = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|x86.ActiveCfg = Release|Any CPU
{A88EB44A-EE33-4A91-8C61-B33B31C9DF07}.Release|x86.Build.0 = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|Any CPU.Build.0 = Debug|Any CPU {AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|ARM.ActiveCfg = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|ARM.Build.0 = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|ARM64.Build.0 = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|x64.ActiveCfg = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|x64.Build.0 = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|x86.ActiveCfg = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Debug|x86.Build.0 = Debug|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|Any CPU.ActiveCfg = Release|Any CPU {AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|Any CPU.Build.0 = Release|Any CPU {AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|Any CPU.Build.0 = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|ARM.ActiveCfg = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|ARM.Build.0 = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|ARM64.ActiveCfg = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|ARM64.Build.0 = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|x64.ActiveCfg = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|x64.Build.0 = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|x86.ActiveCfg = Release|Any CPU
{AAE01ED7-2E8B-40A2-AD0E-95BDA7C99272}.Release|x86.Build.0 = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|ARM.ActiveCfg = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|ARM.Build.0 = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|ARM64.Build.0 = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|x64.ActiveCfg = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|x64.Build.0 = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|x86.ActiveCfg = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Debug|x86.Build.0 = Debug|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|Any CPU.Build.0 = Release|Any CPU {2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|Any CPU.Build.0 = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|ARM.ActiveCfg = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|ARM.Build.0 = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|ARM64.ActiveCfg = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|ARM64.Build.0 = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|x64.ActiveCfg = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|x64.Build.0 = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|x86.ActiveCfg = Release|Any CPU
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5}.Release|x86.Build.0 = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|ARM.ActiveCfg = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|ARM.Build.0 = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|ARM64.Build.0 = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|x64.ActiveCfg = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|x64.Build.0 = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|x86.ActiveCfg = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Debug|x86.Build.0 = Debug|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|Any CPU.Build.0 = Release|Any CPU {92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|Any CPU.Build.0 = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|ARM.ActiveCfg = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|ARM.Build.0 = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|ARM64.ActiveCfg = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|ARM64.Build.0 = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|x64.ActiveCfg = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|x64.Build.0 = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|x86.ActiveCfg = Release|Any CPU
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA}.Release|x86.Build.0 = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|ARM.Build.0 = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|ARM64.Build.0 = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|x64.ActiveCfg = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|x64.Build.0 = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|x86.ActiveCfg = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Debug|x86.Build.0 = Debug|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU {BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|Any CPU.Build.0 = Release|Any CPU {BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|Any CPU.Build.0 = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|ARM.ActiveCfg = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|ARM.Build.0 = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|ARM64.ActiveCfg = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|ARM64.Build.0 = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|x64.ActiveCfg = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|x64.Build.0 = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|x86.ActiveCfg = Release|Any CPU
{BEA824B0-7684-44FF-95BF-A75E92A36C9F}.Release|x86.Build.0 = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|ARM.Build.0 = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|ARM64.Build.0 = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|x64.ActiveCfg = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|x64.Build.0 = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|x86.ActiveCfg = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Debug|x86.Build.0 = Debug|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|Any CPU.Build.0 = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|ARM.ActiveCfg = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|ARM.Build.0 = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|ARM64.ActiveCfg = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|ARM64.Build.0 = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|x64.ActiveCfg = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|x64.Build.0 = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|x86.ActiveCfg = Release|Any CPU
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -71,6 +213,7 @@ Global
{2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2} {2C0F630D-FD5D-4554-B8DD-F11BF4EB49C5} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2}
{92961CA3-ECAB-4920-95CA-F37E8F3EFDFA} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2} {92961CA3-ECAB-4920-95CA-F37E8F3EFDFA} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2}
{BEA824B0-7684-44FF-95BF-A75E92A36C9F} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2} {BEA824B0-7684-44FF-95BF-A75E92A36C9F} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2}
{F46D6CE5-4811-45B8-9CD4-3C993318A2E6} = {D4C7E692-53C0-4423-9944-E25FE3D51BA2}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8D679DCE-AC84-4A91-BFED-8F8D8E1D8183} SolutionGuid = {8D679DCE-AC84-4A91-BFED-8F8D8E1D8183}