From f6cad5f10cde8b73a212f2a0c4f972b21c4574ae Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 8 Mar 2017 20:03:49 +0300 Subject: [PATCH] use msbuild for package restore --- build.cake | 21 ++++++++----------- .../Avalonia.Skia.Desktop.NetStandard.csproj | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build.cake b/build.cake index 8191774dc5..3556a573a3 100644 --- a/build.cake +++ b/build.cake @@ -117,18 +117,15 @@ Task("Restore-NuGet-Packages") toolTimeout+=0.5; }}) .Execute(()=> { - if(parameters.IsRunningOnWindows) - { - NuGetRestore(parameters.MSBuildSolution, new NuGetRestoreSettings { - ToolTimeout = TimeSpan.FromMinutes(toolTimeout) - }); - } - else - { - NuGetRestore(parameters.XBuildSolution, new NuGetRestoreSettings { - ToolTimeout = TimeSpan.FromMinutes(toolTimeout) - }); - } + MSBuild(parameters.MSBuildSolution, settings => { + settings.SetConfiguration(parameters.Configuration); + settings.WithProperty("Platform", "\"" + parameters.Platform + "\""); + settings.SetVerbosity(Verbosity.Minimal); + settings.WithProperty("Windows", "True"); + settings.UseToolVersion(MSBuildToolVersion.VS2017); + settings.WithTarget("restore"); + settings.SetNodeReuse(false); + }); }); }); diff --git a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj index 49d9403875..f1df5d36ea 100644 --- a/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj +++ b/src/Skia/Avalonia.Skia.Desktop.NetStandard/Avalonia.Skia.Desktop.NetStandard.csproj @@ -32,7 +32,7 @@ - +