Browse Source

Removed DevTools and LayoutCompiler

flabbet 1 year ago
parent
commit
055947ca6d

+ 0 - 14
src/PixiEditor.DevTools/DevToolsExtension.cs

@@ -1,14 +0,0 @@
-using PixiEditor.DevTools.Layouts;
-using PixiEditor.Extensions;
-
-namespace PixiEditor.DevTools;
-
-public class DevToolsExtension : Extension
-{
-    public static ExtensionServices PixiEditorApi { get; private set; } = null!;
-    protected override void OnInitialized()
-    {
-        PixiEditorApi = Api;
-        Api.Windowing.CreatePopupWindow("Elements UI Builder", new LiveLayoutPreviewWindow().BuildNative()).Show();
-    }
-}

+ 0 - 34
src/PixiEditor.DevTools/HotReloader.cs

@@ -1,34 +0,0 @@
-namespace PixiEditor.DevTools;
-
-public class HotReloader
-{
-    public List<string> WatchedFiles { get; } = new();
-    public Action<string>? OnFileChanged { get; set; }
-
-    private List<FileSystemWatcher> _watchers = new();
-
-    public void WatchFile(string path, string filter)
-    {
-        string directory = Path.GetDirectoryName(path);
-        WatchedFiles.Add(path);
-
-        FileSystemWatcher watcher = new(directory, filter);
-        watcher.Changed += WatcherOnChanged;
-        watcher.EnableRaisingEvents = true;
-        _watchers.Add(watcher);
-    }
-
-    private void WatcherOnChanged(object sender, FileSystemEventArgs e)
-    {
-        try
-        {
-            (sender as FileSystemWatcher).EnableRaisingEvents = false;
-            OnFileChanged?.Invoke(e.FullPath);
-        }
-
-        finally
-        {
-            (sender as FileSystemWatcher).EnableRaisingEvents = true;
-        }
-    }
-}

+ 0 - 33
src/PixiEditor.DevTools/LayoutDeserializer.cs

@@ -1,33 +0,0 @@
-using PixiEditor.Extensions.FlyUI;
-using PixiEditor.Extensions.FlyUI.Elements;
-
-namespace PixiEditor.DevTools;
-
-public class LayoutDeserializer
-{
-    private LayoutBuilder _builder;
-    public string LayoutFilePath { get; set; }
-
-    public LayoutDeserializer(string layoutFilePath)
-    {
-        LayoutFilePath = layoutFilePath;
-        _builder = new LayoutBuilder(
-            (ElementMap)DevToolsExtension.PixiEditorApi.Services.GetService(typeof(ElementMap)));
-    }
-
-    public LayoutElement DeserializeLayout()
-    {
-        List<byte> bytes = new();
-        using (FileStream fileStream = new(LayoutFilePath, FileMode.Open))
-        {
-            byte[] buffer = new byte[1024];
-            int bytesRead;
-            while ((bytesRead = fileStream.Read(buffer, 0, buffer.Length)) > 0)
-            {
-                bytes.AddRange(buffer.Take(bytesRead));
-            }
-        }
-
-        return (LayoutElement)_builder.Deserialize(bytes.ToArray().AsSpan(), DuplicateResolutionTactic.ReplaceRemoveChildren);
-    }
-}

+ 0 - 11
src/PixiEditor.DevTools/Layouts/LiveLayoutPreviewWindow.cs

@@ -1,11 +0,0 @@
-using PixiEditor.Extensions.FlyUI.Elements;
-
-namespace PixiEditor.DevTools.Layouts;
-
-public class LiveLayoutPreviewWindow : StatefulElement<LivePreviewWindowState>
-{
-    public override LivePreviewWindowState CreateState()
-    {
-        return new();
-    }
-}

+ 0 - 71
src/PixiEditor.DevTools/Layouts/LivePreviewWindowState.cs

@@ -1,71 +0,0 @@
-using PixiEditor.Extensions.CommonApi.FlyUI;
-using PixiEditor.Extensions.CommonApi.FlyUI.Events;
-using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
-using PixiEditor.Extensions.FlyUI.Elements;
-using PixiEditor.Extensions.IO;
-using PixiEditor.Extensions.Runtime;
-
-namespace PixiEditor.DevTools.Layouts;
-
-public class LivePreviewWindowState : State
-{
-    private HotReloader reloader;
-
-    private LayoutElement? _element;
-    private LayoutDeserializer? _deserializer;
-    public string? SelectedProjectFile { get; set; }
-
-    public LivePreviewWindowState()
-    {
-        reloader = new HotReloader();
-        reloader.OnFileChanged += OnFileChanged;
-    }
-
-    public override LayoutElement BuildElement()
-    {
-        return new Column(
-            new Align(
-                alignment: Alignment.TopLeft,
-                child: new Button(
-                    child: SelectedProjectFile != null
-                        ? new Text($"Selected extension: {SelectedProjectFile}")
-                        : new Text("Select extension"),
-                    onClick: OnClick)),
-            new Center(
-                child: _element ?? new Text("No layout element selected"))
-        );
-    }
-
-    private void OnFileChanged(string obj)
-    {
-        SetState(BuildLayoutElement);
-    }
-
-    private void BuildLayoutElement()
-    {
-        if (_deserializer != null)
-        {
-            _element = _deserializer.DeserializeLayout();
-        }
-    }
-
-    private void OnClick(ElementEventArgs args)
-    {
-        if (DevToolsExtension.PixiEditorApi.FileSystem.OpenFileDialog(
-                new FileFilter().AddFilter("Layout file", "*.layout"), out string? path))
-        {
-            SetState(() =>
-            {
-                SelectedProjectFile = path;
-                InitProject();
-            });
-        }
-    }
-
-    private void InitProject()
-    {
-        _deserializer = new LayoutDeserializer(SelectedProjectFile);
-        reloader.WatchFile(SelectedProjectFile, "*.layout");
-        BuildLayoutElement();
-    }
-}

+ 0 - 32
src/PixiEditor.DevTools/PixiEditor.DevTools.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-       <OutputPath>..\PixiEditor.AvaloniaUI.Desktop\bin\Debug\net8.0\Extensions\DevTools</OutputPath>
-       <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-      <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\PixiEditor.Extensions.Runtime\PixiEditor.Extensions.Runtime.csproj" />
-      <ProjectReference Include="..\\.csproj" />
-      <ProjectReference Include="..\PixiEditor.Extensions\PixiEditor.Extensions.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Remove="extension.json" />
-      <Content Include="extension.json">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-      <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0" />
-    </ItemGroup>
-
-</Project>

+ 0 - 21
src/PixiEditor.DevTools/extension.json

@@ -1,21 +0,0 @@
-{
-  "displayName": "PixiEditor Dev Tools",
-  "uniqueName": "Pexeedytoo.DevTools",
-  "description": "PixiEditor Dev Tools contains tools for developers to use when developing PixiEditor extensions.",
-  "version": "0.0.1",
-  "author": {
-    "name": "PixiEditor",
-    "email": "[email protected]",
-    "website": "https://pixieditor.net"
-  },
-  "publisher": {
-    "name": "PixiEditor",
-    "email": "[email protected]",
-    "website": "https://pixieditor.net"
-  },
-  "license": "Copyright PixiEditor Organization",
-  "categories": [
-    "Development",
-    "Utilities"
-  ]
-}

+ 0 - 11
src/PixiEditor.Extensions.MSBuildLayoutCompiler/PixiEditor.Extensions.MSBuildLayoutCompiler.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <RootNamespace>PixiEditor.Extensions.LayoutCompiler</RootNamespace>
-    </PropertyGroup>
-
-</Project>

+ 0 - 58
src/PixiEditor.Extensions.MSBuildLayoutCompiler/Program.cs

@@ -1,58 +0,0 @@
-using System.Reflection;
-
-string assemblyPath = args[0];
-string outputPath = args[1];
-
-Console.WriteLine($"Building layouts from path: {Path.GetFullPath(assemblyPath)} to {Path.GetFullPath(outputPath)}");
-
-Assembly assembly = Assembly.LoadFrom(assemblyPath);
-var exportedTypes = assembly.GetExportedTypes();
-
-exportedTypes.Where(IsLayoutElement).ToList().ForEach(x =>
-{
-    string path = Path.Combine(outputPath, x.Name + ".layout");
-    if(Directory.Exists(outputPath) == false)
-    {
-        Directory.CreateDirectory(outputPath);
-    }
-
-    File.WriteAllBytes(path, GenerateLayoutFile(x));
-});
-
-
-byte[] GenerateLayoutFile(Type type)
-{
-    Console.WriteLine($"Generating layout for {type.Name}");
-    object instance = Activator.CreateInstance(type, TryGetConstructorArgs(type));
-    MethodInfo buildNativeMethod = type.GetMethod("BuildNative");
-    var compiled = buildNativeMethod.Invoke(instance, null);
-    object bytesArray = compiled.GetType().GetMethod("SerializeBytes").Invoke(compiled, null);
-    byte[] bytes = (byte[])bytesArray;
-    return bytes;
-}
-
-bool IsLayoutElement(Type type)
-{
-    if(type.BaseType == null) return false;
-    if(type.BaseType.Name.Contains("StatefulElement") || type.BaseType.Name.Contains("StatelessElement")) return true;
-
-    return IsLayoutElement(type.BaseType);
-}
-
-object?[] TryGetConstructorArgs(Type handler)
-{
-    ConstructorInfo[] constructors = handler.GetConstructors();
-    if (constructors.Length == 0)
-    {
-        return Array.Empty<object>();
-    }
-
-    ConstructorInfo constructor = constructors[0];
-    ParameterInfo[] parameters = constructor.GetParameters();
-    if (parameters.Length == 0)
-    {
-        return Array.Empty<object>();
-    }
-
-    return parameters.Select(x => x.ParameterType.IsValueType ? Activator.CreateInstance(x.ParameterType) : null).ToArray();
-}

+ 0 - 92
src/PixiEditor.sln

@@ -78,14 +78,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.CommonApi", "PixiEditor.Extensions.CommonApi\PixiEditor.Extensions.CommonApi.csproj", "{43C03D0E-EF50-4225-A268-CB9B8E0E8622}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.CommonApi", "PixiEditor.Extensions.CommonApi\PixiEditor.Extensions.CommonApi.csproj", "{43C03D0E-EF50-4225-A268-CB9B8E0E8622}"
 EndProject
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OfficialExtensions", "OfficialExtensions", "{DF94111B-9D40-42D7-9416-4875E846FE8A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.DevTools", "PixiEditor.DevTools\PixiEditor.DevTools.csproj", "{A0C4E418-467E-40E2-BAD6-35F953BA69E5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Runtime", "PixiEditor.Extensions.Runtime\PixiEditor.Extensions.Runtime.csproj", "{5848FCF1-E127-4CE3-8A25-F37032819F8D}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Runtime", "PixiEditor.Extensions.Runtime\PixiEditor.Extensions.Runtime.csproj", "{5848FCF1-E127-4CE3-8A25-F37032819F8D}"
 EndProject
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.MSBuildLayoutCompiler", "PixiEditor.Extensions.MSBuildLayoutCompiler\PixiEditor.Extensions.MSBuildLayoutCompiler.csproj", "{174E2684-9C49-460C-A9F1-A6920F00C036}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiDocks.Avalonia", "..\..\PixiDocks\src\PixiDocks.Avalonia\PixiDocks.Avalonia.csproj", "{6D90B6D9-2B6B-4CCA-A522-047546C2147A}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiDocks.Avalonia", "..\..\PixiDocks\src\PixiDocks.Avalonia\PixiDocks.Avalonia.csproj", "{6D90B6D9-2B6B-4CCA-A522-047546C2147A}"
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Numerics", "PixiEditor.Numerics\PixiEditor.Numerics.csproj", "{FDA53E74-24B0-4304-8BC7-1A580E3CE7B4}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Numerics", "PixiEditor.Numerics\PixiEditor.Numerics.csproj", "{FDA53E74-24B0-4304-8BC7-1A580E3CE7B4}"
@@ -1036,48 +1030,6 @@ Global
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622}.Steam|x64.Build.0 = Debug|Any CPU
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622}.Steam|x64.Build.0 = Debug|Any CPU
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622}.Steam|x86.Build.0 = Debug|Any CPU
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622}.Steam|x86.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevRelease|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevRelease|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevRelease|x64.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevRelease|x64.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevRelease|x86.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevRelease|x86.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevSteam|x64.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevSteam|x64.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevSteam|x86.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.DevSteam|x86.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX Debug|x64.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX Debug|x86.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX Debug|x86.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX|x64.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX|x64.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX|x86.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.MSIX|x86.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Release|x64.Build.0 = Release|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Release|x86.Build.0 = Release|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Steam|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Steam|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Steam|x64.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Steam|x64.Build.0 = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Steam|x86.ActiveCfg = Debug|Any CPU
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5}.Steam|x86.Build.0 = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1120,48 +1072,6 @@ Global
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Steam|x64.Build.0 = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Steam|x64.Build.0 = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Steam|x86.ActiveCfg = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Steam|x86.Build.0 = Debug|Any CPU
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D}.Steam|x86.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Debug|x64.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Debug|x86.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevRelease|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevRelease|Any CPU.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevRelease|x64.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevRelease|x64.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevRelease|x86.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevRelease|x86.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevSteam|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevSteam|Any CPU.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevSteam|x64.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevSteam|x64.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevSteam|x86.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.DevSteam|x86.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX Debug|Any CPU.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX Debug|x64.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX Debug|x86.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX Debug|x86.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX|Any CPU.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX|x64.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX|x64.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX|x86.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.MSIX|x86.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Release|Any CPU.Build.0 = Release|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Release|x64.ActiveCfg = Release|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Release|x64.Build.0 = Release|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Release|x86.ActiveCfg = Release|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Release|x86.Build.0 = Release|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Steam|Any CPU.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Steam|Any CPU.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Steam|x64.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Steam|x64.Build.0 = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Steam|x86.ActiveCfg = Debug|Any CPU
-		{174E2684-9C49-460C-A9F1-A6920F00C036}.Steam|x86.Build.0 = Debug|Any CPU
 		{6D90B6D9-2B6B-4CCA-A522-047546C2147A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D90B6D9-2B6B-4CCA-A522-047546C2147A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D90B6D9-2B6B-4CCA-A522-047546C2147A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D90B6D9-2B6B-4CCA-A522-047546C2147A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D90B6D9-2B6B-4CCA-A522-047546C2147A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6D90B6D9-2B6B-4CCA-A522-047546C2147A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1536,9 +1446,7 @@ Global
 		{B30622ED-9177-4930-8E64-2B2352D4D8DC} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{B30622ED-9177-4930-8E64-2B2352D4D8DC} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{1249EE2B-EB0D-411C-B311-53A7A22B7743} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{43C03D0E-EF50-4225-A268-CB9B8E0E8622} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
-		{A0C4E418-467E-40E2-BAD6-35F953BA69E5} = {DF94111B-9D40-42D7-9416-4875E846FE8A}
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{5848FCF1-E127-4CE3-8A25-F37032819F8D} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
-		{174E2684-9C49-460C-A9F1-A6920F00C036} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{FDA53E74-24B0-4304-8BC7-1A580E3CE7B4} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{FDA53E74-24B0-4304-8BC7-1A580E3CE7B4} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
 		{5E8F82CF-F48A-40B2-99E3-9BBB8725866A} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{5E8F82CF-F48A-40B2-99E3-9BBB8725866A} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{9FCCD0CF-FF76-4638-A712-803EFBBC641F} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}
 		{9FCCD0CF-FF76-4638-A712-803EFBBC641F} = {13DD041C-EE2D-4AF8-B43E-D7BFC7415E4D}