From a192f799058bf81aeb43e81d2b5e820164807f05 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 11 Feb 2016 10:36:25 -0800 Subject: [PATCH] Updating to CLI 1290 build on Windows --- KoreBuild-dotnet/build/KoreBuild.cmd | 2 +- KoreBuild-dotnet/build/_dotnet-pack.shade | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/KoreBuild-dotnet/build/KoreBuild.cmd b/KoreBuild-dotnet/build/KoreBuild.cmd index 6316ea21a9..b40260f2e9 100644 --- a/KoreBuild-dotnet/build/KoreBuild.cmd +++ b/KoreBuild-dotnet/build/KoreBuild.cmd @@ -14,7 +14,7 @@ IF "%KOREBUILD_DOTNET_CHANNEL%"=="" ( ) IF "%KOREBUILD_DOTNET_VERSION%"=="" ( - SET KOREBUILD_DOTNET_VERSION=1.0.0.001248 + SET KOREBUILD_DOTNET_VERSION=1.0.0.001290 ) IF NOT EXIST Sake ( diff --git a/KoreBuild-dotnet/build/_dotnet-pack.shade b/KoreBuild-dotnet/build/_dotnet-pack.shade index a9b50c85c3..2c11195182 100644 --- a/KoreBuild-dotnet/build/_dotnet-pack.shade +++ b/KoreBuild-dotnet/build/_dotnet-pack.shade @@ -19,7 +19,12 @@ default pack_options=' ${E("KOREBUILD_DOTNET_PACK_OPTIONS")}' @{ var projectFolder=Path.GetDirectoryName(projectFile); var projectName=Path.GetFileName(projectFolder); - var projectBin=Path.Combine(projectFolder, "bin", configuration); + var projectBin=Path.Combine(projectFolder, "bin"); + + if (IsLinux) + { + projectBin = Path.Combine(projectBin, configuration); + } DeleteFolder(projectBin);