From dfb033e51c885acb0a16c2a8c9314126d6fc12f2 Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Wed, 16 Dec 2015 15:15:43 -0800 Subject: [PATCH] Use nuget add instead of dnu packages add --- .../build/_nuget-packages-add.shade | 20 ++++++++++++------- .../build/_nuget-resilient-publish.shade | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/KoreBuild-dotnet/build/_nuget-packages-add.shade b/KoreBuild-dotnet/build/_nuget-packages-add.shade index 46016cf93f..bfff0a9316 100644 --- a/KoreBuild-dotnet/build/_nuget-packages-add.shade +++ b/KoreBuild-dotnet/build/_nuget-packages-add.shade @@ -13,11 +13,17 @@ targetPackagesDir='' default targetPackagesDir='' @{ - var packages = Directory.EnumerateFiles(sourcePackagesDir, "*.nupkg") - .Where(p => !p.EndsWith(".symbols.nupkg")); + var packages = Directory.EnumerateFiles(sourcePackagesDir, "*.nupkg") + .Where(p => !p.EndsWith(".symbols.nupkg")); -} - --// Temporarily use dnu until we have a nuget command -exec program='cmd' commandline='/c dnu packages add ${package} ${targetPackagesDir}' each='var package in packages' if='!IsLinux' -exec program='dnu' commandline='packages add ${package} ${targetPackagesDir}' each='var package in packages' if='IsLinux' + var nugetExePath = Environment.GetEnvironmentVariable("PUSH_NUGET_EXE"); + if (string.IsNullOrEmpty(nugetExePath)) + { + nugetExePath = ".build/NuGet.exe"; + } + + Parallel.ForEach(packages, package => + { + ExecClr(nugetExePath, "add " + package + " -source " + targetPackagesDir + " -expand"); + }); +} \ No newline at end of file diff --git a/KoreBuild-dotnet/build/_nuget-resilient-publish.shade b/KoreBuild-dotnet/build/_nuget-resilient-publish.shade index 32e235639b..14bf8c4270 100644 --- a/KoreBuild-dotnet/build/_nuget-resilient-publish.shade +++ b/KoreBuild-dotnet/build/_nuget-resilient-publish.shade @@ -28,7 +28,7 @@ set nugetArgs='${nugetArgs} ${extra}' if='!string.IsNullOrEmpty(extra)' var nugetExePath = Environment.GetEnvironmentVariable("PUSH_NUGET_EXE"); if (string.IsNullOrEmpty(nugetExePath)) { - nugetExePath = ".nuget/NuGet.exe"; + nugetExePath = ".build/NuGet.exe"; } Parallel.ForEach(packages, package =>