huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issues with no finding main project k package if not on mono

This commit is contained in:
David Fowler 2014-04-26 12:53:45 -07:00
parent 90a149ab80
commit e90fe3cefa
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
build/_k.shade
View File

@ -40,10 +40,10 @@ nuget-install package='ProjectK.Mono' outputDir='packages' extra='-pre -nocache'
return Int64.MaxValue; return Int64.MaxValue;
}; };
var projectKPrefix = mono ? "ProjectK.Mono*" : "ProjectK"; var projectKPrefix = mono ? "ProjectK.Mono" : "ProjectK";
string packagesDir = Path.Combine(Directory.GetCurrentDirectory(), "packages"), string packagesDir = Path.Combine(Directory.GetCurrentDirectory(), "packages"),
projectKDir = Directory.EnumerateDirectories(packagesDir, projectKPrefix) projectKDir = Directory.EnumerateDirectories(packagesDir, projectKPrefix + "*")
.OrderByDescending(getVersion) .OrderByDescending(getVersion)
.First(); .First();
@ -56,25 +56,28 @@ default kMonoProgram='${projectKDir}/tools/net45/klr.mono.managed.dll'
default monoPath='${Environment.GetEnvironmentVariable("MONO_PATH")}' default monoPath='${Environment.GetEnvironmentVariable("MONO_PATH")}'
@{ @{
if(string.IsNullOrEmpty(monoPath)) if(mono)
{ {
monoPath = "mono"; if(string.IsNullOrEmpty(monoPath))
} {
monoPath = "mono";
}
var folder = Path.Combine(projectKDir, "tools", "net45"); var folder = Path.Combine(projectKDir, "tools", "net45");
var kMonoEntryPoint = Path.GetFullPath(kMonoProgram); var kMonoEntryPoint = Path.GetFullPath(kMonoProgram);
if(command.StartsWith("build")) if(command.StartsWith("build"))
{ {
command = kMonoEntryPoint + " --lib " + folder + " Microsoft.Net.Project " + command; command = kMonoEntryPoint + " --lib " + folder + " Microsoft.Net.Project " + command;
} }
else if(command.StartsWith("restore")) else if(command.StartsWith("restore"))
{ {
command = Path.Combine(projectKDir, "tools", "NuGet.exe") + " " + command; command = Path.Combine(projectKDir, "tools", "NuGet.exe") + " " + command;
} }
else else
{ {
command = kMonoEntryPoint + " --lib " + folder + " Microsoft.Net.ApplicationHost " + command; command = kMonoEntryPoint + " --lib " + folder + " Microsoft.Net.ApplicationHost " + command;
}
} }
} }