Merge branch 'master' into dont-composite-on-every-frame

9 years ago · fcd7d13f5d
5 changed files with 10 additions and 10 deletions
--- a/.ncrunch/Avalonia.DotNetCoreRuntime.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.DotNetCoreRuntime.v3.ncrunchproject
@ -1,5 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
+  <Settings />
    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject
@ -1,5 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
+  <Settings />
    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Win32.NetStandard.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Win32.NetStandard.v3.ncrunchproject
@ -1,5 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
+  <Settings />
    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/ControlCatalog.NetCore.v3.ncrunchproject
+++ b/.ncrunch/ControlCatalog.NetCore.v3.ncrunchproject
@ -0,0 +1,5 @@
 <ProjectConfiguration>
  <Settings>
    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
  </Settings>
 </ProjectConfiguration>
--- a/tests/Avalonia.RenderTests/.gitignore
+++ b/tests/Avalonia.RenderTests/.gitignore
@ -1 +1,2 @@
-obj-Skia/
+obj-Skia/
 obj-Skia/*