Merge branch 'development' into feature/avalonia

src/Artemis.Core/Models/Profile/RenderProfileElement.cs

@@ -314,7 +314,7 @@ public abstract class RenderProfileElement : ProfileElement
         int index = 0;
         foreach (BaseLayerEffect baseLayerEffect in LayerEffects.OrderBy(e => e.Order))
         {
-            baseLayerEffect.Order = Order = index + 1;
+            baseLayerEffect.Order = index + 1;
             index++;
         }
 
@@ -393,4 +393,4 @@ public abstract class RenderProfileElement : ProfileElement
     }
 
     #endregion
-}
+}

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reactive;
 using System.Reflection;
 using System.Text;
+using System.Windows;
 using Artemis.Core;
 using Artemis.Core.Modules;
 using Artemis.UI.Shared.Services;

src/Artemis.UI/Artemis.UI.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
         <TargetFramework>net6.0</TargetFramework>