From aa2beb83c2c191f888294b25d0ae4065ff4c73d9 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Thu, 1 Oct 2015 14:29:26 -0700
Subject: [PATCH] Revert "Execute correct commands when building with Core CLR
 on Linux" - bad merge; this commit should not have been included

This reverts commit 18d637dfc72c2b70ba8d6c758b41d0b08b47179c.
---
 build/_git.shade              | 4 ++--
 build/_k-restore.shade        | 4 ++--
 build/_k-standard-goals.shade | 2 +-
 build/_k.shade                | 6 +++---
 build/_kpm-build.shade        | 4 ++--
 build/_kpm-pack.shade         | 4 ++--
 build/_kpm-publish.shade      | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build/_git.shade b/build/_git.shade
index eb05ca81be..6d34b212bf 100644
--- a/build/_git.shade
+++ b/build/_git.shade
@@ -2,6 +2,6 @@
 default gitFolder=''
 
 -// Use cmd to invoke git so that people who have git as a 'cmd'
-exec program='cmd' commandline='/C git ${gitCommand}' workingdir='${gitFolder}' if='!IsLinux'
-exec program='git' commandline='${gitCommand}' workingdir='${gitFolder}' if='IsLinux'
+exec program='cmd' commandline='/C git ${gitCommand}' workingdir='${gitFolder}' if='!IsMono'
+exec program='git' commandline='${gitCommand}' workingdir='${gitFolder}' if='IsMono'
 
diff --git a/build/_k-restore.shade b/build/_k-restore.shade
index 701641db4a..de5d385de1 100644
--- a/build/_k-restore.shade
+++ b/build/_k-restore.shade
@@ -12,5 +12,5 @@ default restoreDir = '${ currentDir }'
 
 default restore_options='${ E("NUGET3_restore_options") }'
 
-exec program='cmd' commandline='/C dnu restore --parallel ${ restore_options }' workingdir='${ restoreDir }' if='!IsLinux'
-exec program='dnu' commandline='restore ${ restore_options }' workingdir='${ restoreDir }' if='IsLinux'
+exec program='cmd' commandline='/C dnu restore --parallel ${ restore_options }' workingdir='${ restoreDir }' if='!IsMono'
+exec program='dnu' commandline='restore ${ restore_options }' workingdir='${ restoreDir }' if='IsMono'
\ No newline at end of file
diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade
index e2446c77b9..d3eabaa3c4 100644
--- a/build/_k-standard-goals.shade
+++ b/build/_k-standard-goals.shade
@@ -151,7 +151,7 @@ default NUGET_FEED = 'https://api.nuget.org/v3/index.json'
       }
   }
 
-#native-compile target='compile' if='!IsLinux && Directory.Exists(Path.Combine(BASE_DIR, "src"))'
+#native-compile target='compile' if='!IsMono && Directory.Exists(Path.Combine(BASE_DIR, "src"))'
   var programFilesX86 = '${Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}'
   var nativeProjects ='${Files.Include(Path.Combine(BASE_DIR, "src", "**", "*.vcxproj"))}'
 
diff --git a/build/_k.shade b/build/_k.shade
index 245e486a65..c83df51cae 100644
--- a/build/_k.shade
+++ b/build/_k.shade
@@ -12,6 +12,6 @@ default dnvmUse=''
 
 var dnvmPath='${Directory.GetCurrentDirectory()}\packages\KoreBuild\build\dnvm'
 
-exec program='cmd' commandline='/C dnx ${command}' if='!IsLinux && string.IsNullOrEmpty(dnvmUse)'
-exec program='cmd' commandline='/C "${dnvmPath}" run ${dnvmUse} ${command}' if='!IsLinux && !string.IsNullOrEmpty(dnvmUse)'
-exec program='dnx' commandline='${command}' if='IsLinux'
+exec program='cmd' commandline='/C dnx ${command}' if='!IsMono && string.IsNullOrEmpty(dnvmUse)'
+exec program='cmd' commandline='/C "${dnvmPath}" run ${dnvmUse} ${command}' if='!IsMono && !string.IsNullOrEmpty(dnvmUse)'
+exec program='dnx' commandline='${command}' if='IsMono'
diff --git a/build/_kpm-build.shade b/build/_kpm-build.shade
index dbb8395b2c..a0130af8e2 100644
--- a/build/_kpm-build.shade
+++ b/build/_kpm-build.shade
@@ -37,7 +37,7 @@ default build_options='${E("NUGET3_build_options")}'
 
         var projectsArg=projectFile.Replace(";", " ");
         var dnuArgs=string.Format("build{0} {1} --configuration {2}", build_options, projectsArg, configuration);
-        if (!IsLinux)
+        if (!IsMono)
         {
             Exec("cmd", "/C dnu " + dnuArgs);
         }
@@ -54,7 +54,7 @@ default build_options='${E("NUGET3_build_options")}'
         DeleteFolder(projectBin);
 
         var dnuArgs=string.Format("build{0} {1} --configuration {2}", build_options, projectFolder, configuration);
-        if (!IsLinux)
+        if (!IsMono)
         {
             Exec("cmd", "/C dnu " + dnuArgs);
         }
diff --git a/build/_kpm-pack.shade b/build/_kpm-pack.shade
index a3b0c40059..0a438cdbef 100644
--- a/build/_kpm-pack.shade
+++ b/build/_kpm-pack.shade
@@ -40,7 +40,7 @@ default pack_options='${E("NUGET3_pack_options")}'
 
         var projectsArg=projectFile.Replace(";", " ");
         var dnuArgs=string.Format("pack{0} {1} --configuration {2}", pack_options, projectsArg, configuration);
-        if (!IsLinux)
+        if (!IsMono)
         {
             Exec("cmd", "/C dnu " + dnuArgs);
         }
@@ -66,7 +66,7 @@ default pack_options='${E("NUGET3_pack_options")}'
         DeleteFolder(projectBin);
 
         var dnuArgs=string.Format("pack{0} {1} --configuration {2}", pack_options, projectFolder, configuration);
-        if (!IsLinux)
+        if (!IsMono)
         {
             Exec("cmd", "/C dnu " + dnuArgs);
         }
diff --git a/build/_kpm-publish.shade b/build/_kpm-publish.shade
index 10193ac874..1ade43509d 100644
--- a/build/_kpm-publish.shade
+++ b/build/_kpm-publish.shade
@@ -17,5 +17,5 @@ default targetPackagesDir=''
                            .Where(p => !p.EndsWith(".symbols.nupkg"));
 }
 
-exec program='cmd' commandline='/C dnu packages add ${package} ${targetPackagesDir}' if='!IsLinux' each='var package in packages'
-exec program='dnu' commandline='packages add ${package} ${targetPackagesDir}' if='IsLinux' each='var package in packages'
+exec program='cmd' commandline='/C dnu packages add ${package} ${targetPackagesDir}' if='!IsMono' each='var package in packages'
+exec program='dnu' commandline='packages add ${package} ${targetPackagesDir}' if='IsMono' each='var package in packages'