From 2471a9259a64c04e003a9a974009faf1d9cd599d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 4 Mar 2020 10:47:12 -0800 Subject: [PATCH] Use full paths to project files (#66) --- src/Tye.Core/ProjectReader.cs | 6 ++++-- src/tye/Program.DeployCommand.cs | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Tye.Core/ProjectReader.cs b/src/Tye.Core/ProjectReader.cs index 6e33de87..55692566 100644 --- a/src/Tye.Core/ProjectReader.cs +++ b/src/Tye.Core/ProjectReader.cs @@ -68,10 +68,12 @@ namespace Tye } output.WriteDebugLine("Running 'dotnet msbuild'."); - output.WriteCommandLine("dotnet", $"msbuild {restore} /t:EvaluateTyeProjectInfo \"/p:TyeTargetLocation={programRoot}\" \"/p:TyeOutputFilePath={outputFilePath}\""); + var msbuildCommand = $"msbuild {restore} /t:EvaluateTyeProjectInfo \"/p:TyeTargetLocation={programRoot}\" \"/p:TyeOutputFilePath={outputFilePath}\""; + + output.WriteCommandLine("dotnet", msbuildCommand); var exitCode = await Process.ExecuteAsync( $"dotnet", - $"msbuild {restore} /t:EvaluateTyeProjectInfo \"/p:TyeTargetLocation={programRoot}\" \"/p:TyeOutputFilePath={outputFilePath}\"", + msbuildCommand, workingDir: projectFile.DirectoryName, stdOut: capture.StdOut, stdErr: capture.StdErr); diff --git a/src/tye/Program.DeployCommand.cs b/src/tye/Program.DeployCommand.cs index 443afb61..99d32642 100644 --- a/src/tye/Program.DeployCommand.cs +++ b/src/tye/Program.DeployCommand.cs @@ -70,7 +70,8 @@ namespace Tye { if (configService.Project is string projectFile) { - var project = new Project(projectFile); + var fullPathProjectFile = Path.Combine(application.Source.DirectoryName, projectFile); + var project = new Project(fullPathProjectFile); var service = new Service(configService.Name) { Source = project, @@ -89,7 +90,7 @@ namespace Tye var serviceEntry = new ServiceEntry(service, configService.Name); - await ProjectReader.ReadProjectDetailsAsync(output, new FileInfo(projectFile), project); + await ProjectReader.ReadProjectDetailsAsync(output, new FileInfo(fullPathProjectFile), project); var container = new ContainerInfo() {