Review comments

samples/ControlCatalog/App.xaml

@@ -60,7 +60,7 @@
     <Style Selector="Label.h3">
       <Setter Property="FontSize" Value="12" />
     </Style>
-  </Application.Styles><!--
+  </Application.Styles>
   <TrayIcon.Icons>
     <TrayIcons>
       <TrayIcon Icon="/Assets/test_icon.ico" ToolTipText="Avalonia Tray Icon ToolTip">
@@ -81,5 +81,5 @@
         </TrayIcon.Menu>
       </TrayIcon>
     </TrayIcons>
-  </TrayIcon.Icons>-->
+  </TrayIcon.Icons>
 </Application>

tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Avalonia.Base.UnitTests.Utilities;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;

tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj

@@ -16,6 +16,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />

tests/Avalonia.RenderTests/TestBase.cs

@@ -17,6 +17,7 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Media;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
+using Avalonia.UnitTests;
 using Avalonia.Utilities;
 using SixLabors.ImageSharp.PixelFormats;
 using Image = SixLabors.ImageSharp.Image;

tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj

@@ -17,6 +17,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />

src/Avalonia.Base/Utilities/DispatcherTimerHelper.cs → tests/Avalonia.UnitTests/DispatcherTimerHelper.cs

@@ -1,11 +1,6 @@
 using Avalonia.Threading;
 
-namespace Avalonia.Utilities;
+namespace Avalonia.UnitTests;
-
-public class DispatcherTimerHelper
-{
-    
-}
 
 public static class DispatcherTimerUtils
 {