From 5b00c8f524cdc4f0cfc73a7843afaa655e0f0ffe Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 28 Feb 2021 11:02:34 +0100 Subject: [PATCH] Readme - Expanded build instructions to include Artemis.Plugins Debugger - XAML cleanup --- README.md | 8 ++++++-- .../Settings/Debug/Tabs/DataModelDebugView.xaml | 14 ++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 42694ef1f..90d3634c5 100644 --- a/README.md +++ b/README.md @@ -21,16 +21,20 @@ Artemis 1 is no longer supported and Artemis 2 is in active development. This en 1. Create a central folder like ```C:\Repos``` 2. Clone RGB.NET's [development branch](https://github.com/DarthAffe/RGB.NET/tree/Development) into ```\RGB.NET``` 3. Clone Artemis into ```\Artemis``` +4. Clone Artemis.Plugins [master branch](https://github.com/Artemis-RGB/Artemis.Plugins/tree/master) into ```\Artemis.Plugins``` 5. Open ```\RGB.NET\RGB.NET.sln``` and build with the default config -4. Open ```\Artemis\src\Artemis.sln``` -5. Restore Nuget packages +6. Open ```\Artemis\src\Artemis.sln``` and build as Debug +7. Open ```\Artemis.Plugins\src\Artemis.Plugins.sln``` and build as Debug +8. Restore Nuget packages ##### Alternatively in PowerShell ```powershell git clone https://github.com/DarthAffe/RGB.NET -b Development RGB.NET git clone https://github.com/Artemis-RGB/Artemis Artemis +git clone https://github.com/Artemis-RGB/Artemis.Plugins Artemis.Plugins dotnet build .\RGB.NET\RGB.NET.sln dotnet build .\Artemis\src\Artemis.sln +dotnet build .\Artemis.Plugins\src\Artemis.Plugins.sln ``` For an up-to-date overview of what's currently being worked on, see the [Projects](https://github.com/SpoinkyNL/Artemis/projects) page diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml index 213cf4533..729c67a9a 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml +++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml @@ -6,10 +6,10 @@ xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Debug.Tabs" xmlns:s="https://github.com/canton7/Stylet" xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:modules="clr-namespace:Artemis.Core.Modules;assembly=Artemis.Core" xmlns:dataModel="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" mc:Ignorable="d" - d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:DataModelDebugViewModel}"> + d:DesignHeight="450" d:DesignWidth="800" + d:DataContext="{d:DesignInstance local:DataModelDebugViewModel}"> @@ -33,16 +33,18 @@ - + - Filter module - Filter module + -