Outputs to "remotebase/projectName" folder

Author: DamianSuess

src/VsLinuxDebugger/Commands.Impl.cs

@@ -126,8 +126,8 @@ private UserOptions ToUserOptions()
 
         RemoteDebugDisplayGui = Settings.RemoteDebugDisplayGui,
         RemoteDeployBasePath = Settings.RemoteDeployBasePath,
-        RemoteDeployDebugPath = Settings.RemoteDeployDebugPath,
-        RemoteDeployReleasePath = Settings.RemoteDeployReleasePath,
+        ////RemoteDeployDebugPath = Settings.RemoteDeployDebugPath,
+        ////RemoteDeployReleasePath = Settings.RemoteDeployReleasePath,
         RemoteDotNetPath = Settings.RemoteDotNetPath,
         RemoteVsDbgPath = Settings.RemoteVsDbgPath,
 

src/VsLinuxDebugger/Core/LaunchBuilder.cs

@@ -21,31 +21,31 @@ public LaunchBuilder(DTE2 dte, Project dteProject, UserOptions o)
 
       AssemblyName = dteProject.Properties.Item("AssemblyName").Value.ToString();
       ProjectConfigName = dteProject.ConfigurationManager.ActiveConfiguration.ConfigurationName;
-      ProjectFullName = dteProject.FullName;
+      ProjectFileFullPath = dteProject.FullName;
       ProjectName = dteProject.Name;
-      SolutionFullName = dte.Solution.FullName;
+      SolutionFileFullPath = dte.Solution.FullName;
       SolutionDirPath = Path.GetDirectoryName(dte.Solution.FullName);
       OutputDirName = dteProject.ConfigurationManager.ActiveConfiguration.Properties.Item("OutputPath").Value.ToString();
-      OutputDirFullName = Path.Combine(Path.GetDirectoryName(dteProject.FullName), OutputDirName);
+      OutputDirFullPath = Path.Combine(Path.GetDirectoryName(dteProject.FullName), OutputDirName);
     }
 
     public string AssemblyName { get; set; }
 
     public string CommandLineArgs { get; set; } = string.Empty;
 
-    public string OutputDirFullName { get; set; }
+    public string OutputDirFullPath { get; set; }
 
     public string OutputDirName { get; set; }
 
     public string ProjectConfigName { get; set; }
 
-    public string ProjectFullName { get; set; }
+    public string ProjectFileFullPath { get; set; }
 
     public string ProjectName { get; set; }
 
     public string SolutionDirPath { get; set; }
 
-    public string SolutionFullName { get; set; }
+    public string SolutionFileFullPath { get; set; }
 
     /// <summary>Generates the project's `launch.json` file.</summary>
     /// <returns>Returns the local path to the file.</returns>

src/VsLinuxDebugger/Core/RemoteDebugger.cs

@@ -84,7 +84,7 @@ public async Task<bool> BeginAsync(BuildOptions buildOptions)
 
           if (buildOptions.HasFlag(BuildOptions.Debug))
           {
-            BuildDebugAttacher();
+            // BuildDebugAttacher();
           }
         }
 
@@ -153,7 +153,7 @@ private void BuildBegin()
       ////BuildEvents.OnBuildProjConfigDone += BuildEvents_OnBuildProjConfigDone;
 
       dte.SuppressUI = false;
-      dte.Solution.SolutionBuild.BuildProject(_launchBuilder.ProjectConfigName, _launchBuilder.ProjectFullName);
+      dte.Solution.SolutionBuild.BuildProject(_launchBuilder.ProjectConfigName, _launchBuilder.ProjectFileFullPath);
     }
 
     private void BuildCleanup()

src/VsLinuxDebugger/Core/SshTool.cs

@@ -26,6 +26,8 @@ public SshTool(UserOptions opts, LaunchBuilder launch)
       _launch = launch;
     }
 
+    public string RemoteDeployPath => $"{_opts.RemoteDeployBasePath}/{_launch.ProjectName}";
+
     public string Bash(string command)
     {
       try
@@ -125,8 +127,8 @@ public void MakeDeploymentFolder()
     {
       // do we need SUDO?
       Bash($"mkdir -p {_opts.RemoteDeployBasePath}");
-      Bash($"mkdir -p {_opts.RemoteDeployDebugPath}");
-      Bash($"mkdir -p {_opts.RemoteDeployReleasePath}");
+      //// Bash($"mkdir -p {_opts.RemoteDeployDebugPath}");
+      //// Bash($"mkdir -p {_opts.RemoteDeployReleasePath}");
 
       var group = string.IsNullOrEmpty(_opts.UserGroupName)
         ? string.Empty
@@ -163,21 +165,21 @@ public async Task<string> UploadFilesAsync()
     {
       try
       {
-        Bash($@"mkdir -p {_opts.RemoteDeployDebugPath}");
+        Bash($@"mkdir -p {RemoteDeployPath}");
 
         // TODO: Rev1 - Iterate through each file and upload it via SCP client or SFTP.
         // TODO: Rev2 - Compress _localHost.OutputDirFullName, upload ZIP, and unzip it.
         // TODO: Rev3 - Allow for both SFTP and SCP as a backup. This separating connection to a new disposable class.
         //// LogOutput($"Connected to {_connectionInfo.Username}@{_connectionInfo.Host}:{_connectionInfo.Port} via SSH and {(_sftpClient != null ? "SFTP" : "SCP")}");
 
-        var srcDirInfo = new DirectoryInfo(_launch.OutputDirFullName);
+        var srcDirInfo = new DirectoryInfo(_launch.OutputDirFullPath);
         if (!srcDirInfo.Exists)
-          throw new DirectoryNotFoundException($"Directory '{_launch.OutputDirFullName}' not found!");
+          throw new DirectoryNotFoundException($"Directory '{_launch.OutputDirFullPath}' not found!");
 
         // Compress files to upload as single `tar.gz`.
         // TODO: Use base folder path: var pathTarGz = $"{_opts.RemoteDeployBasePath}/{_tarGzFileName}";
 
-        var destTarGz = $"{_opts.RemoteDeployDebugPath}/{_tarGzFileName}";
+        var destTarGz = $"{RemoteDeployPath}/{_tarGzFileName}";
         var success = PayloadCompressAndUpload(_sftp, srcDirInfo, destTarGz);
 
         // Decompress file
@@ -374,7 +376,7 @@ private bool PayloadDecompress(string pathBuildTarGz, bool removeTarGz = true)
       try
       {
         var cmd = "set -e";
-        cmd += $";cd \"{_opts.RemoteDeployDebugPath}\"";
+        cmd += $";cd \"{RemoteDeployPath}\"";
         cmd += $";tar -zxf \"{_tarGzFileName}\"";
         ////cmd += $";tar -zxf \"{pathBuildTarGz}\"";
 

src/VsLinuxDebugger/Core/UserOptions.cs

@@ -9,9 +9,9 @@ public class UserOptions
     public string LocalPLinkPath { get; set; }
 
     public bool RemoteDebugDisplayGui { get; set; }
-    public string RemoteDeployBasePath { get; set; }
-    public string RemoteDeployDebugPath { get; set; }
-    public string RemoteDeployReleasePath { get; set; }
+    public string RemoteDeployBasePath { get; set; }  // TODO: Scrub trailing '/\' chars
+    ////public string RemoteDeployDebugPath { get; set; }
+    ////public string RemoteDeployReleasePath { get; set; }
     public string RemoteDotNetPath { get; set; }
     public string RemoteVsDbgPath { get; set; }
 

src/VsLinuxDebugger/DebuggerPackage.cs

@@ -39,8 +39,8 @@ public sealed partial class DebuggerPackage : AsyncPackage
 
     public bool RemoteDebugDisplayGui => _optionsPage.RemoteDebugDisplayGui;
     public string RemoteDeployBasePath => _optionsPage.RemoteDeployBasePath;
-    public string RemoteDeployDebugPath => $"{_optionsPage.RemoteDeployBasePath}/TMP";
-    public string RemoteDeployReleasePath => $"{_optionsPage.RemoteDeployBasePath}/TMP";
+    ////public string RemoteDeployDebugPath => $"{_optionsPage.RemoteDeployBasePath}/TMP";
+    ////public string RemoteDeployReleasePath => $"{_optionsPage.RemoteDeployBasePath}/TMP";
     public string RemoteDotNetPath => _optionsPage.RemoteDotNetPath;
     public string RemoteVsDbgPath => _optionsPage.RemoteVsDbgPath;
 

src/VsLinuxDebugger/DebuggerPackage.vsct

@@ -86,22 +86,22 @@
         <Parent guid="GuidLinuxDebugerMenu" id="RemoteMainMenuGroupLevel1" />
         <CommandFlag>DynamicVisibility</CommandFlag>
         <CommandFlag>TextChanges</CommandFlag>
-        <!--<CommandFlag>DefaultDisabled</CommandFlag>-->
+        <CommandFlag>DefaultDisabled</CommandFlag>
         <Icon guid="DeployAndDebug_16x" id="imgDeployAndDebug" />
         <Strings>
           <ButtonText>Build, Deploy and Debug</ButtonText>
         </Strings>
       </Button>
 
-      <Button guid="GuidLinuxDebugerMenu" id="CmdDebugOnly" priority="0x0402" type="Button">
+      <!--<Button guid="GuidLinuxDebugerMenu" id="CmdDebugOnly" priority="0x0402" type="Button">
         <Parent guid="GuidLinuxDebugerMenu" id="RemoteMainMenuGroupLevel1" />
         <CommandFlag>DynamicVisibility</CommandFlag>
         <CommandFlag>TextChanges</CommandFlag>
         <Icon guid="DebugOnly_16x" id="imgDebugOnly" />
         <Strings>
           <ButtonText>Debug only</ButtonText>
         </Strings>
-      </Button>
+      </Button>-->
 
       <!--
       TODO: Publish & Publish and Debug