Make new Accelerate Dev Tools available (#151)

Author: pauldumais

README.md

@@ -8,3 +8,21 @@ Custom Avalonia Themes developed by [Devolutions](https://devolutions.net/)
 
 ➡️ [DevExpress Theme](https://github.com/Devolutions/avalonia-themes/blob/master/src/Devolutions.AvaloniaTheme.DevExpress/README.md)
 
+➡️ [Linux Theme](https://github.com/Devolutions/avalonia-themes/blob/master/src/Devolutions.AvaloniaTheme.Linux/README.md)
+
+# Sample App
+
+Contributers can use the SampleApp to test, debug and document styles for the various controls under each theme.
+
+## Debugging
+
+The SampleApp attaches the Avalonia Dev Tools for inspecting controls (open with F12).
+
+If you own a licence for the new Dev Tools in _Avalonia Accelerate_, you can set an environment variable in your IDE's debug configuration. 
+For example, in Rider: 
+
+- Open **Run > Edit Configurations**
+- Pick your configuration for the SampleApp 
+- In the **Environment Variables** field add `USE_AVALONIA_ACCELERATE_TOOLS=true`
+
+The F12 key then opens the new Dev Tools, and F10 opens the old version 

samples/SampleApp/App.axaml.cs

@@ -19,7 +19,7 @@ public class App : Application
   public override void Initialize()
   {
     AvaloniaXamlLoader.Load(this);
-    
+
     if (!Avalonia.Controls.Design.IsDesignMode)
     {
       Styles.Clear();

samples/SampleApp/MainWindow.axaml.cs

@@ -1,6 +1,8 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Styling;
 
 namespace SampleApp;
@@ -11,7 +13,20 @@ public MainWindow()
   {
     InitializeComponent();
 #if DEBUG
-    this.AttachDevTools();
+    bool useAccelerate = Environment.GetEnvironmentVariable("USE_AVALONIA_ACCELERATE_TOOLS")?.ToLowerInvariant() == "true";
+    
+    if (useAccelerate)
+    {
+      // Enable Accelerate dev tools (AvaloniaUI.DiagnosticsSupport) - requiring a licence to use
+      (Application.Current as App)?.AttachDeveloperTools(); 
+      // Enable original free dev tools (Avalonia.Diagnostics) as an additional option available on F10
+      this.AttachDevTools(new KeyGesture(Key.F10));
+    }
+    else
+    {
+      // Enable original free dev tools (Avalonia.Diagnostics)
+      this.AttachDevTools(); 
+    }
 #endif
   }
 

samples/SampleApp/SampleApp.csproj

@@ -8,15 +8,27 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+        <!-- Prevent automatic attachment of regular free dev tools to avoid duplicate mapping of F12 key -->
+        <AvaloniaNameGeneratorAttachDevTools>false</AvaloniaNameGeneratorAttachDevTools>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="11.3.0" />
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
         <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.0" />
     </ItemGroup>
 
+    <ItemGroup>
+        <!--Add both, Classic and Accelerate Dev Tools -->
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.0" />
+        <PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.0.3" >
+            <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+            <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+    
     <ItemGroup>
         <PackageReference Include="Avalonia.Svg.Skia" Version="11.3.0" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>