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

Get the current runtime path via PlatformServices.Default 

- This fixes an issue whith ApplicationDeployer on Mono.
  Instead of giving the dnx path, Process.GetCurrentProcess().MainModule.FileName
  would give the path to the Mono executable.
This commit is contained in:
Stephen Halter 2015-10-28 15:45:33 -07:00
parent 0b14bc135b
commit 4ad38625c7
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -10,6 +10,7 @@ using System.Text.RegularExpressions;
using System.Threading;
using Microsoft.AspNet.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Server.Testing
{
@ -99,23 +100,7 @@ namespace Microsoft.AspNet.Server.Testing
protected string PopulateChosenRuntimeInformation()
{
string currentRuntimeBinPath = string.Empty;
if (TestPlatformHelper.IsMac && DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr)
{
var path = Environment.GetEnvironmentVariable("PATH");
currentRuntimeBinPath = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).
Where(c => c.Contains("dnx-coreclr-darwin") || c.Contains("dnx-mono")).FirstOrDefault();
if (string.IsNullOrWhiteSpace(currentRuntimeBinPath))
{
throw new Exception("Runtime not detected on the machine.");
}
}
else
{
// ex: runtimes/dnx-coreclr-win-x64.1.0.0-rc1-15844/bin
currentRuntimeBinPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
}
string currentRuntimeBinPath = PlatformServices.Default.Runtime.RuntimePath;
Logger.LogInformation($"Current runtime path is : {currentRuntimeBinPath}");
var targetRuntimeName = new StringBuilder()