Improve AddDataverseSolutionProject UX & menu placement

The AddDataverseSolutionProject command now uses the solution folder as the initial directory if invoked from one, otherwise defaults to the solution directory. The command is moved to the standard Visual Studio "Add" submenu for both solution and solution folder context menus, improving discoverability and aligning with standard workflows. The button text is shortened to "Dataverse Solution Project...".

Author: rezanid

src/XrmTools/Commands/AddDataverseSolutionProjectCommand.cs

@@ -42,9 +42,25 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
             var solution = await VS.Solutions.GetCurrentSolutionAsync().ConfigureAwait(false)
                 ?? throw new InvalidOperationException("Open a solution before adding a Dataverse solution project.");
-            var initialParentDirectory = Path.GetDirectoryName(solution.FullPath)
+            var solutionDir = Path.GetDirectoryName(solution.FullPath)
                 ?? throw new InvalidOperationException("The current solution must be saved before adding a project.");
 
+            // When invoked from a solution folder, use that folder's path; otherwise fall back to solution directory.
+            var selectedItems = await VS.Solutions.GetActiveItemsAsync().ConfigureAwait(false);
+            var initialParentDirectory = solutionDir;
+            foreach (var item in selectedItems)
+            {
+                if (item.Type == SolutionItemType.SolutionFolder && !string.IsNullOrEmpty(item.FullPath))
+                {
+                    var folderDir = Path.GetDirectoryName(item.FullPath);
+                    if (!string.IsNullOrEmpty(folderDir))
+                    {
+                        initialParentDirectory = folderDir;
+                    }
+                    break;
+                }
+            }
+
             var request = await DataverseSolutionProjectDialog.ShowDialogAsync(
                 initialParentDirectory,
                 RepositoryFactory,

src/XrmTools/VSCommandTable.vsct

@@ -137,12 +137,13 @@
           <CanonicalName>.XrmTools.ResetTemplates</CanonicalName>
         </Strings>
       </Button>
-      <Button guid="XrmToolsCmdSetId" id="AddDataverseSolutionProjectCmdId" priority="0x0100" type="Button">
-        <Parent guid="XrmToolsCmdSetId" id="XrmToolsSolutionContextMenuGroup" />
+      <!--[Solution Context Menu] > [Add] > "Dataverse Solution Project..."-->
+      <Button guid="XrmToolsCmdSetId" id="AddDataverseSolutionProjectCmdId" priority="0x0900" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_SOLUTION_ADD_PROJ" />
         <Icon guid="ImageCatalogGuid" id="Package" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
-          <ButtonText>Add Dataverse Solution Project...</ButtonText>
+          <ButtonText>Dataverse Solution Project...</ButtonText>
           <CanonicalName>.XrmTools.DataverseSolution.AddProject</CanonicalName>
         </Strings>
       </Button>
@@ -353,6 +354,10 @@
     <!--<CommandPlacement guid="XrmToolsCmdSetId" id="NewPluginDefinitionCmdId" priority="0x0200">
       <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_SLNFLDR_ADD_ITEM"/>
     </CommandPlacement>-->
+    <!--[Solution Folder Context Menu] > [Add] > "Dataverse Solution Project..."-->
+    <CommandPlacement guid="XrmToolsCmdSetId" id="AddDataverseSolutionProjectCmdId" priority="0x0900">
+      <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_SLNFLDR_ADD_PROJ"/>
+    </CommandPlacement>
     <!--Project Context Menu > "Set environment..."-->
     <CommandPlacement guid="XrmToolsCmdSetId" id="SetEnvironmentCmdId" priority="0x0200">
       <Parent guid="XrmToolsCmdSetId" id="XrmToolsProjectContextMenuGroup"/>