[ignite] branch master updated: IGNITE-14047 .NET: Fix NuGet download condition in build.ps1

[pt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ptupitsyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 727897f  IGNITE-14047 .NET: Fix NuGet download condition in build.ps1
727897f is described below

commit 727897f6e091466f552d299a9dafbc5fd962bb78
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Mon Jan 25 18:08:35 2021 +0300

    IGNITE-14047 .NET: Fix NuGet download condition in build.ps1
    
    NuGet is required both for building the .NET Framework part and for the packing.
---
 modules/platforms/dotnet/build.ps1 | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1
index cde1544..3e14c08 100644
--- a/modules/platforms/dotnet/build.ps1
+++ b/modules/platforms/dotnet/build.ps1
@@ -174,7 +174,7 @@ cd $PSScriptRoot
 
 
 # 2) Build .NET
-if ((!$skipDotNet) -and (!$skipNuGet)) {
+if (!($skipDotNet -and $skipNuGet)) {
     # Detect NuGet
     $ng = if ($nugetPath) { $nugetPath } else { "nuget" }
 
@@ -302,13 +302,9 @@ if (!$skipNuGet) {
         }
 
     echo "NuGet packages created in '$pwd\$nupkgDir'."
-}
-
-# 4) Build Examples
-if ((!$skipDotNetCore) -and (!$skipExamples)) {
-    Exec "dotnet build .\examples\Apache.Ignite.Examples.sln"
-
-    if (!$skipNuGet) {
+    
+    # Examples template
+    if (!$skipExamples) {
         # Copy csproj to current dir temporarily: dotnet-new templates can't be packed with parent dir content.
         Copy-Item .\templates\public\Apache.Ignite.Examples\Apache.Ignite.Examples.csproj $pwd
 
@@ -320,3 +316,8 @@ if ((!$skipDotNetCore) -and (!$skipExamples)) {
     }
 }
 
+# 4) Build Examples
+if ((!$skipDotNetCore) -and (!$skipExamples)) {
+    Exec "dotnet build .\examples\Apache.Ignite.Examples.sln"
+}
+