From 54553b44d39d7e32d7980da4b7d9276bdbd69b94 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Mon, 27 Jul 2020 16:48:41 +0200
Subject: [PATCH 1/3] Make npm silent

---
 nukebuild/Build.cs                                            | 4 +++-
 .../Remote/HtmlTransport/webapp/webpack.config.js             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index fe877dc49c..fbfbf47e1b 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -128,7 +128,9 @@ partial class Build : NukeBuild
         {
             var webappDir = RootDirectory / "src" / "Avalonia.DesignerSupport" / "Remote" / "HtmlTransport" / "webapp";
 
-            NpmTasks.NpmInstall(c => c.SetWorkingDirectory(webappDir));
+            NpmTasks.NpmInstall(c => c
+                .SetWorkingDirectory(webappDir)
+                .SetArgumentConfigurator(a => a.Add("--silent")));
             NpmTasks.NpmRun(c => c
                 .SetWorkingDirectory(webappDir)
                 .SetCommand("dist"));
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
index 3057f269a5..3750351165 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/webapp/webpack.config.js
@@ -93,7 +93,7 @@ const config = {
     plugins:
         [
         new Printer(),
-        new CleanWebpackPlugin([path.resolve(__dirname, 'build')]),
+        new CleanWebpackPlugin([path.resolve(__dirname, 'build')], { verbose: false }),
         new MiniCssExtractPlugin({
             filename: "[name].[chunkhash]h" +
             ".css",

From 385dd5227155342ed5c1fb142bcbfcce21312584 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 27 Jul 2020 13:33:15 -0300
Subject: [PATCH 2/3] remove apicompat from backend impl checks.

---
 .../Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj | 3 +--
 src/Skia/Avalonia.Skia/Avalonia.Skia.csproj                    | 3 +--
 src/Windows/Avalonia.Win32/Avalonia.Win32.csproj               | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
index 22599200bc..48095a4c25 100644
--- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
@@ -7,6 +7,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\..\build\ApiDiff.props" />
+  </ItemGroup>  
 </Project>
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index ef955eb8be..ac029f1062 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -16,6 +16,5 @@
   
   <Import Project="..\..\..\build\SkiaSharp.props" />
   <Import Project="..\..\..\build\HarfBuzzSharp.props" />
-  <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
-  <Import Project="..\..\..\build\ApiDiff.props" />
+  <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />  
 </Project>
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index bcbdde322c..7fc24d4d3d 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -8,6 +8,5 @@
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
   </ItemGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />  
-  <Import Project="..\..\..\build\ApiDiff.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />    
 </Project>

From 307ab82292bf4eed46e390e7d77def7acc28cbcb Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 27 Jul 2020 13:37:01 -0300
Subject: [PATCH 3/3] remove opengl apicompat checks.

---
 src/Avalonia.OpenGL/Avalonia.OpenGL.csproj | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
index 2e23f24deb..d761e60c07 100644
--- a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
+++ b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -9,7 +9,5 @@
       <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
       <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
       <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    </ItemGroup>
-
-    <Import Project="..\..\build\ApiDiff.props" />
+    </ItemGroup>    
 </Project>