mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Allow ilcpath argument to include "ilc.exe"

Browse source 
Allows the argument passed to dotnet compile --native --ilcpath to be
either end with ilc.exe, or with the directory that contains ilc.exe.

Fix #768
This commit is contained in:
Noah Falk 2016-01-08 19:20:22 -08:00
parent 459e5bdeda
commit 5cdf1e7ab6
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Microsoft.DotNet.Tools.Compiler.Native/ArgValues.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
namespace Microsoft.DotNet.Tools.Compiler.Native namespace Microsoft.DotNet.Tools.Compiler.Native
{ {
@ -56,8 +57,20 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
if (!string.IsNullOrEmpty(IlcPath)) if (!string.IsNullOrEmpty(IlcPath))
{ {
config.IlcPath = IlcPath; // We want a directory path. If the user gave us the exact path to the executable
config.IlcSdkPath = IlcPath; // then we can be helpful and convert that to the directory rather than forcing
// the command to be re-typed.
string ilcDir = IlcPath;
if (File.Exists(IlcPath) && !Directory.Exists(IlcPath))
{
string potentialIlcDir = Path.GetDirectoryName(IlcPath);
if (Directory.Exists(potentialIlcDir))
{
ilcDir = potentialIlcDir;
}
}
config.IlcPath = ilcDir;
config.IlcSdkPath = ilcDir;
} }
if (!string.IsNullOrEmpty(IlcSdkPath)) if (!string.IsNullOrEmpty(IlcSdkPath))