Merge pull request #59 from clahil-linum/develop

fix issues #32
SuessLabs · Jul 4, 2023 · c4d7cad · c4d7cad
2 parents 55034d2 + e726d31
commit c4d7cad
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 33 deletions.
diff --git a/release-notes.md b/release-notes.md
@@ -4,6 +4,11 @@
 
 This document contains the release information for the project.
 
+### 2.0.3
+
+* Fixed: As per #32 add vsdbg constant to debugger full path.
+* Added: Try to be more clear about the .NET executable in user options. It's not a path but the dotnet executable.
+
 ### 2.0.2
 
 * Fixed: As per #53, cleaned up exponential Build status messages.

diff --git a/src/VsLinuxDebugger/Core/UserOptions.cs b/src/VsLinuxDebugger/Core/UserOptions.cs
@@ -18,7 +18,7 @@ public class UserOptions
     /// <summary>Base path to VSDBG (i.e. `~/.vsdbg`).</summary>
     public string RemoteVsDbgBasePath { get; set; }
     /// <summary>Full path to VS Debugger.</summary>
-    public string RemoteVsDbgFullPath => LinuxPath.Combine(RemoteVsDbgBasePath, Constants.VS2022);
+    public string RemoteVsDbgFullPath => LinuxPath.Combine(RemoteVsDbgBasePath, Constants.VS2022, Constants.AppVSDbg);
 
     public bool UseCommandLineArgs { get; set; }
     public bool UsePublish { get; set; }

diff --git a/src/VsLinuxDebugger/OptionsPages/OptionsPage.DotNet.cs b/src/VsLinuxDebugger/OptionsPages/OptionsPage.DotNet.cs
@@ -22,8 +22,8 @@ public partial class OptionsPage : DialogPage
     public string RemoteDeployBasePath { get; set; } = $"./VSLinuxDbg"; // "LinuxDbg"
 
     [Category(RemoteDebugger)]
-    [DisplayName(".NET Path")]
-    [Description("Path of .NET on remote machine. (Samples: `dotnet`, `~/.dotnet/dotnet`)")]
+    [DisplayName(".NET executable")]
+    [Description("Path of the .NET executable on remote machine. (Samples: `dotnet`, `~/.dotnet/dotnet`)")]
     public string RemoteDotNetPath { get; set; } = Constants.DefaultDotNetPath;
 
     [Category(RemoteDebugger)]

diff --git a/src/VsLinuxDebugger/source.extension.vsixmanifest b/src/VsLinuxDebugger/source.extension.vsixmanifest
@@ -2,34 +2,34 @@
 <PackageManifest Version="2.0.0"
                  xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
                  xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="VsLinuxDebugger.4d7bf4de-5015-4e24-92c0-7f9f3397b2da"
-              Version="2.0.2"
-              Language="en-US"
-              Publisher="Suess Labs" />
-    <DisplayName>VS Linux Debugger</DisplayName>
-    <Description xml:space="preserve">Remotely deploy and debug your .NET apps visa SSH on your Linux device using Visual Studio 2022. Works with popular Linux distrobutions such as Ubuntu, Raspberry Pi, and more!</Description>
-    <MoreInfo>https://github.com/SuessLabs/VsLinuxDebug</MoreInfo>
-    <License>LICENSE.txt</License>
-    <GettingStartedGuide>..\..\readme.md</GettingStartedGuide>
-    <ReleaseNotes>..\..\release-notes.md</ReleaseNotes>
-    <Icon>Resources\TuxDebug.png</Icon>
-    <Tags>debug; build; remote debug; vsdbg; linux; xamarin; rpi; rpi4; remotedebug; remote; debugger; linux debug; net6; dotnet; raspberry pi; ubuntu;</Tags>
-  </Metadata>
-  <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
-      <ProductArchitecture>amd64</ProductArchitecture>
-    </InstallationTarget>
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-  </Dependencies>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor"
-                  Version="[17.0,18.0)"
-                  DisplayName="Visual Studio core editor" />
-  </Prerequisites>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-  </Assets>
+    <Metadata>
+        <Identity Id="VsLinuxDebugger.4d7bf4de-5015-4e24-92c0-7f9f3397b2da"
+                  Version="2.0.3"
+                  Language="en-US"
+                  Publisher="Suess Labs" />
+        <DisplayName>VS Linux Debugger</DisplayName>
+        <Description xml:space="preserve">Remotely deploy and debug your .NET apps visa SSH on your Linux device using Visual Studio 2022. Works with popular Linux distrobutions such as Ubuntu, Raspberry Pi, and more!</Description>
+        <MoreInfo>https://github.com/SuessLabs/VsLinuxDebug</MoreInfo>
+        <License>LICENSE.txt</License>
+        <GettingStartedGuide>..\..\readme.md</GettingStartedGuide>
+        <ReleaseNotes>..\..\release-notes.md</ReleaseNotes>
+        <Icon>Resources\TuxDebug.png</Icon>
+        <Tags>debug; build; remote debug; vsdbg; linux; xamarin; rpi; rpi4; remotedebug; remote; debugger; linux debug; net6; dotnet; raspberry pi; ubuntu;</Tags>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor"
+                      Version="[17.0,18.0)"
+                      DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    </Assets>
 </PackageManifest>