Browse Source

Normalize directories to their absolute paths after reading (#195)

pull/198/head
David Fowler 7 years ago
committed by GitHub
parent
commit
2484cb4804
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      src/Microsoft.Tye.Core/ProjectReader.cs
  2. 4
      src/Microsoft.Tye.Hosting/Model/ProjectRunInfo.cs

12
src/Microsoft.Tye.Core/ProjectReader.cs

@ -201,9 +201,7 @@ namespace Microsoft.Tye
project.TargetPath = projectInstance.GetPropertyValue("TargetPath");
project.PublishDir = projectInstance.GetPropertyValue("PublishDir");
project.AssemblyName = projectInstance.GetPropertyValue("AssemblyName");
project.IntermediateOutputPath = projectInstance.GetPropertyValue("AssemblyName");
project.IntermediateOutputPath = projectInstance.GetPropertyValue("IntermediateOutputPath");
output.WriteDebugLine($"RunCommand={project.RunCommand}");
output.WriteDebugLine($"RunArguments={project.RunArguments}");
@ -212,10 +210,10 @@ namespace Microsoft.Tye
output.WriteDebugLine($"AssemblyName={project.AssemblyName}");
output.WriteDebugLine($"IntermediateOutputPath={project.IntermediateOutputPath}");
if (!Path.IsPathRooted(project.IntermediateOutputPath))
{
project.IntermediateOutputPath = Path.Combine(project.ProjectFile.DirectoryName, project.IntermediateOutputPath);
}
// Normalize directories to their absolute paths
project.IntermediateOutputPath = Path.Combine(project.ProjectFile.DirectoryName, project.IntermediateOutputPath);
project.TargetPath = Path.Combine(project.ProjectFile.DirectoryName, project.TargetPath);
project.PublishDir = Path.Combine(project.ProjectFile.DirectoryName, project.PublishDir);
var targetFramework = projectInstance.GetPropertyValue("TargetFramework");
project.TargetFramework = targetFramework;

4
src/Microsoft.Tye.Hosting/Model/ProjectRunInfo.cs

@ -17,10 +17,10 @@ namespace Microsoft.Tye.Hosting.Model
TargetFramework = project.TargetFramework;
Version = project.Version;
AssemblyName = project.AssemblyName;
TargetAssemblyPath = Path.Combine(project.ProjectFile.Directory.Name, project.TargetPath);
TargetAssemblyPath = project.TargetPath;
RunCommand = project.RunCommand;
RunArguments = project.RunArguments;
PublishOutputPath = Path.Combine(project.ProjectFile.Directory.Name, project.PublishDir);
PublishOutputPath = project.PublishDir;
}
public string? Args { get; }

Loading…
Cancel
Save