From 3adcbd10f7ffe68acc364edefb2cccbfd1b23515 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 5 Feb 2016 10:36:25 -0800 Subject: [PATCH] Move temp delete elsewhere --- KoreBuild-dotnet/build/_dotnet.shade | 16 ++++++++++++++++ KoreBuild-dotnet/build/_k-standard-goals.shade | 14 -------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/KoreBuild-dotnet/build/_dotnet.shade b/KoreBuild-dotnet/build/_dotnet.shade index 901ab9fd02..c8b481eb57 100644 --- a/KoreBuild-dotnet/build/_dotnet.shade +++ b/KoreBuild-dotnet/build/_dotnet.shade @@ -9,6 +9,22 @@ dotnetDir='' Optional. The directory in which to execute the `dotnet` command. */} +@{ + //temporary delete cross-gen files + var installDir = Environment.GetEnvironmentVariable("DOTNET_INSTALL_DIR"); + if (string.IsNullOrEmpty(installDir)) + { + installDir = Path.Combine(Environment.GetEnvironmentVariable("LocalAppData"), "Microsoft", "dotnet", "cli"); + } + + var files = Directory.GetFiles(installDir, "*.ni.*", SearchOption.AllDirectories); + foreach (var file in files.Where(f => !f.Contains("mscorlib"))) + { + Console.WriteLine("Deleting {0}", file); + File.Delete(file); + } +} + default currentDir = '${Directory.GetCurrentDirectory()}' default dotnetDir = '${ currentDir }' diff --git a/KoreBuild-dotnet/build/_k-standard-goals.shade b/KoreBuild-dotnet/build/_k-standard-goals.shade index 78a07913b5..e8083eda23 100644 --- a/KoreBuild-dotnet/build/_k-standard-goals.shade +++ b/KoreBuild-dotnet/build/_k-standard-goals.shade @@ -94,20 +94,6 @@ default NUGET_FEED = 'https://api.nuget.org/v3/index.json' #build-compile target='compile' if='Directory.Exists("src")' @{ - //temporary delete cross-gen files - var installDir = Environment.GetEnvironmentVariable("DOTNET_INSTALL_DIR"); - if (string.IsNullOrEmpty(installDir)) - { - installDir = Path.Combine(Environment.GetEnvironmentVariable("LocalAppData"), "Microsoft", "dotnet", "cli"); - } - - var files = Directory.GetFiles(installDir, "*.ni.*", SearchOption.AllDirectories); - foreach (var file in files.Where(f => !f.Contains("mscorlib"))) - { - Console.WriteLine("Deleting {0}", file); - File.Delete(file); - } - var projectFiles = Files.Include("src/**/project.json").ToList(); projectFiles.ForEach(projectFile => DotnetPack(projectFile, BUILD_DIR, Configuration));