diff --git a/api/Avalonia.Controls.ColorPicker.nupkg.xml b/api/Avalonia.Controls.ColorPicker.nupkg.xml
index 978aafcc88..90271d6e98 100644
--- a/api/Avalonia.Controls.ColorPicker.nupkg.xml
+++ b/api/Avalonia.Controls.ColorPicker.nupkg.xml
@@ -4,61 +4,61 @@
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorPicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorPreviewer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorSlider.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorSpectrum.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Fluent/ColorView.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorPicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorPreviewer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorSlider.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorSpectrum.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Themes/Simple/ColorView.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Controls.ColorPicker.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Controls.ColorPicker.dll</Right>
   </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Fluent.nupkg.xml b/api/Avalonia.Themes.Fluent.nupkg.xml
index 5204e75fdd..f35bf5a629 100644
--- a/api/Avalonia.Themes.Fluent.nupkg.xml
+++ b/api/Avalonia.Themes.Fluent.nupkg.xml
@@ -4,415 +4,415 @@
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/BaseResources.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/FluentControlResources.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AdornerLayer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AutoCompleteBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Button.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ButtonSpinner.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Calendar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDatePicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDayButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CaptionButtons.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Carousel.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CheckBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBoxItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContentControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContextMenu.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DataValidationErrors.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DatePicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DateTimePickerShared.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DropDownButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/EmbeddableControlRoot.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Expander.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FlyoutPresenter.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/GridSplitter.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ItemsControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Label.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBoxItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ManagedFileChooser.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Menu.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuFlyoutPresenter.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuScrollViewer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NativeMenuBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NotificationCard.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NumericUpDown.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/OverlayPopupHost.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PathIcon.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PopupRoot.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ProgressBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RadioButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshContainer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshVisualizer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RepeatButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollViewer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SelectableTextBlock.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Separator.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Slider.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitView.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStrip.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStripItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TextBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ThemeVariantScope.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TimePicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TitleBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleSwitch.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToolTip.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TransitioningContentControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeView.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeViewItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Window.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/WindowNotificationManager.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Fluent.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Fluent.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Fluent.dll</Right>
   </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/api/Avalonia.Themes.Simple.nupkg.xml b/api/Avalonia.Themes.Simple.nupkg.xml
index 199ccd76df..78d8c4b332 100644
--- a/api/Avalonia.Themes.Simple.nupkg.xml
+++ b/api/Avalonia.Themes.Simple.nupkg.xml
@@ -4,403 +4,403 @@
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Accents/Base.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AdornerLayer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/AutoCompleteBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Button.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ButtonSpinner.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Calendar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDatePicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarDayButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CalendarItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CaptionButtons.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Carousel.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/CheckBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ComboBoxItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContentControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ContextMenu.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DataValidationErrors.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DatePicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DateTimePickerShared.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/DropDownButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/EmbeddableControlRoot.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Expander.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/FlyoutPresenter.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/GridSplitter.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ItemsControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Label.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ListBoxItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ManagedFileChooser.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Menu.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuFlyoutPresenter.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/MenuItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NativeMenuBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NotificationCard.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/NumericUpDown.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/OverlayPopupHost.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PathIcon.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/PopupRoot.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ProgressBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RadioButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshContainer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RefreshVisualizer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/RepeatButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ScrollViewer.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SelectableTextBlock.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Separator.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Slider.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/SplitView.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStrip.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TabStripItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TextBox.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ThemeVariantScope.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TimePicker.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TitleBar.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleButton.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToggleSwitch.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/ToolTip.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TransitioningContentControl.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeView.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/TreeViewItem.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/Window.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:CompiledAvaloniaXaml.!AvaloniaResources.NamespaceInfo:/Controls/WindowNotificationManager.xaml</Target>
-    <Left>baseline\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Left>
-    <Right>target\lib\netstandard2.0\Avalonia.Themes.Simple.dll</Right>
+    <Left>baseline/netstandard2.0/Avalonia.Themes.Simple.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Themes.Simple.dll</Right>
   </Suppression>
 </Suppressions>
\ No newline at end of file
diff --git a/nukebuild/ApiDiffValidation.cs b/nukebuild/ApiDiffValidation.cs
index d0fc3d02e1..bd576250bd 100644
--- a/nukebuild/ApiDiffValidation.cs
+++ b/nukebuild/ApiDiffValidation.cs
@@ -40,9 +40,12 @@ public static class ApiDiffValidation
 
             var suppressionFile = Path.Combine(suppressionFilesFolder, GetPackageId(packagePath) + ".nupkg.xml");
 
+            // Don't use Path.Combine with these left and right tool parameters.
+            // Microsoft.DotNet.ApiCompat.Tool is stupid and treats '/' and '\' as different assemblies in suppression files.
+            // So, always use Unix '/'
             foreach (var baselineDll in baselineDlls)
             {
-                var baselineDllPath = Path.Combine("baseline", baselineDll.target, baselineDll.entry.Name);
+                var baselineDllPath = $"baseline/{baselineDll.target}/{baselineDll.entry.Name}";
                 var baselineDllRealPath = Path.Combine(tempFolder, baselineDllPath);
                 Directory.CreateDirectory(Path.GetDirectoryName(baselineDllRealPath)!);
                 await using (var baselineDllFile = File.Create(baselineDllRealPath))
@@ -57,7 +60,7 @@ public static class ApiDiffValidation
                     throw new InvalidOperationException($"Some assemblies are missing in the new package: {baselineDll.entry.Name} for {baselineDll.target}");
                 }
 
-                var targetDllPath = Path.Combine("target", targetDll.target, targetDll.entry.Name);
+                var targetDllPath = $"target/{targetDll.target}/{targetDll.entry.Name}";
                 var targetDllRealPath = Path.Combine(tempFolder, targetDllPath);
                 Directory.CreateDirectory(Path.GetDirectoryName(targetDllRealPath)!);
                 await using (var targetDllFile = File.Create(targetDllRealPath))
@@ -99,11 +102,12 @@ public static class ApiDiffValidation
         return archive.Entries
             .Where(e => Path.GetExtension(e.FullName) == ".dll"
                 // Exclude analyzers and build task, as we don't care about breaking changes there
-                && !e.FullName.Contains("analyzers/") && !e.Name.Contains("Avalonia.Build.Tasks"))
+                && !e.FullName.Contains("analyzers/") && !e.FullName.Contains("analyzers\\")
+                && !e.Name.Contains("Avalonia.Build.Tasks"))
             .Select(e => (
                 entry: e,
-                isRef: e.FullName.Contains("ref/"),
-                target: Path.GetDirectoryName(e.FullName)!.Split('/').Last())
+                isRef: e.FullName.Contains("ref/") || e.FullName.Contains("ref\\"),
+                target: Path.GetDirectoryName(e.FullName)!.Split(new [] { '/', '\\' }).Last())
             )
             .GroupBy(e => (e.target, e.entry.Name))
             .Select(g => g.MaxBy(e => e.isRef))