From 1e36297c6199e053c0a6bc2cd6370cc8ddea5357 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 17 Nov 2021 23:10:11 +0100 Subject: [PATCH] Fix build --- .../EnumEqualsNodeCustomViewModel.cs | 6 +++--- src/Artemis.sln | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/Artemis.VisualScripting/Nodes/CustomViewModels/EnumEqualsNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/CustomViewModels/EnumEqualsNodeCustomViewModel.cs index 65f0eb05a..b42530baf 100644 --- a/src/Artemis.VisualScripting/Nodes/CustomViewModels/EnumEqualsNodeCustomViewModel.cs +++ b/src/Artemis.VisualScripting/Nodes/CustomViewModels/EnumEqualsNodeCustomViewModel.cs @@ -1,6 +1,6 @@ -using Artemis.Core; +using System; +using Artemis.Core; using Artemis.Core.Events; -using Artemis.UI.Shared; using Stylet; namespace Artemis.VisualScripting.Nodes.CustomViewModels @@ -14,7 +14,7 @@ namespace Artemis.VisualScripting.Nodes.CustomViewModels _node = node; } - public BindableCollection EnumValues { get; } = new(); + public BindableCollection<(Enum, string)> EnumValues { get; } = new(); public override void OnActivate() { diff --git a/src/Artemis.sln b/src/Artemis.sln index 7ba869e7a..10dd6db3f 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -15,10 +15,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI.Console", "Artem EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI.Avalonia", "Artemis.UI.Avalonia\Artemis.UI.Avalonia.csproj", "{035CBB38-7B9E-4375-A39C-E9A5B01F23A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.UI.Avalonia.Shared", "Artemis.UI.Avalonia.Shared\Artemis.UI.Avalonia.Shared.csproj", "{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.UI.Avalonia.Shared", "Artemis.UI.Avalonia.Shared\Artemis.UI.Avalonia.Shared.csproj", "{05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.VisualScripting", "Artemis.VisualScripting\Artemis.VisualScripting.csproj", "{CF125C61-FD85-47EE-AF64-38B8F90DD50C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WPF", "WPF", "{EE9A3079-7BFE-4E7B-A3D4-D3501C9A874A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{960CAAC5-AA73-49F5-BF2F-DF2C789DF042}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,14 +77,23 @@ Global {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|Any CPU.Build.0 = Release|Any CPU {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.ActiveCfg = Release|Any CPU {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.Build.0 = Release|Any CPU + {CF125C61-FD85-47EE-AF64-38B8F90DD50C}.Debug|Any CPU.ActiveCfg = Debug|x64 {CF125C61-FD85-47EE-AF64-38B8F90DD50C}.Debug|x64.ActiveCfg = Debug|x64 {CF125C61-FD85-47EE-AF64-38B8F90DD50C}.Debug|x64.Build.0 = Debug|x64 + {CF125C61-FD85-47EE-AF64-38B8F90DD50C}.Release|Any CPU.ActiveCfg = Release|x64 {CF125C61-FD85-47EE-AF64-38B8F90DD50C}.Release|x64.ActiveCfg = Release|x64 {CF125C61-FD85-47EE-AF64-38B8F90DD50C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {46B74153-77CF-4489-BDF9-D53FDB1F7ACB} = {EE9A3079-7BFE-4E7B-A3D4-D3501C9A874A} + {ADB357E6-151D-4D0D-87CB-68FD0BC29812} = {EE9A3079-7BFE-4E7B-A3D4-D3501C9A874A} + {035CBB38-7B9E-4375-A39C-E9A5B01F23A5} = {960CAAC5-AA73-49F5-BF2F-DF2C789DF042} + {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0} = {960CAAC5-AA73-49F5-BF2F-DF2C789DF042} + {CF125C61-FD85-47EE-AF64-38B8F90DD50C} = {EE9A3079-7BFE-4E7B-A3D4-D3501C9A874A} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C203080A-4473-4CC2-844B-F552EA43D66A} EndGlobalSection