Merge branch 'master' into ncomp-deps

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"));

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",

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>
+    </ItemGroup>    
-
-    <Import Project="..\..\build\ApiDiff.props" />
 </Project>

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>
+  </ItemGroup>  
-  <Import Project="..\..\..\build\ApiDiff.props" />
 </Project>

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="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />  
-  <Import Project="..\..\..\build\ApiDiff.props" />
 </Project>

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="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />    
-  <Import Project="..\..\..\build\ApiDiff.props" />
 </Project>