Begin package.json context menu command.

stratisdevex · Nov 20, 2024 · 45b689b · 45b689b
1 parent 9716e21
commit 45b689b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 41 deletions.
diff --git a/src/Stratis.VS.SolidityProjectBuildTasks/CompileContracts.cs b/src/Stratis.VS.SolidityProjectBuildTasks/CompileContracts.cs
@@ -10,6 +10,9 @@ public class CompileContracts : Task
         [Required]
         public string ExtDir { get; set; }
 
+        [Required]
+        public string ProjectDir { get; set; }
+
         [Required]
         public ITaskItem[] Contracts { get; set; }
 

diff --git a/src/Stratis.VS.StratisEVM/BuildSystem/Solidity.targets b/src/Stratis.VS.StratisEVM/BuildSystem/Solidity.targets
@@ -74,7 +74,7 @@
 
   <UsingTask TaskName="CompileContracts" AssemblyFile="$(LocalAppData)\CustomProjectSystems\Solidity\Tools\Stratis.VS.SolidityProjectBuildTasks.dll"/>
   <Target Name="Build">
-    <CompileContracts ExtDir="$(ExtDir)" Contracts="@(Contract)" />
+    <CompileContracts ExtDir="$(ExtDir)" ProjectDir="$(MSBuildProjectDirectory)" Contracts="@(Contract)" />
   </Target>
 
   <Target Name="Rebuild">

diff --git a/src/Stratis.VS.StratisEVM/SolidityProjectItemContextMenuProvider.cs b/src/Stratis.VS.StratisEVM/SolidityProjectItemContextMenuProvider.cs
diff --git a/src/Stratis.VS.StratisEVM/Stratis.VS.StratisEVM.csproj b/src/Stratis.VS.StratisEVM/Stratis.VS.StratisEVM.csproj
@@ -47,7 +47,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="SolidityProjectItemContextMenuProvider.cs" />
     <Compile Include="SolidityProjectMenuCommands.cs" />
     <Compile Include="SolidityProjectMonikers.cs" />
     <Compile Include="SolidityProjectTreePropertiesProvider.cs" />

diff --git a/src/Stratis.VS.StratisEVM/StratisEVMPackage.cs b/src/Stratis.VS.StratisEVM/StratisEVMPackage.cs
@@ -45,6 +45,11 @@ namespace Stratis.VS.StratisEVM
         expression: "(SingleProject | MultipleProjects) & Solidity",
         termNames: new[] { "SingleProject", "MultipleProjects", "Solidity" },
         termValues: new[] { SolutionHasSingleProject_string, SolutionHasMultipleProjects_string, "HierSingleSelectionName:.sol$" })]
+    [ProvideUIContextRule(NPMFileUIContextRule,
+        name: "NPM Configuration Files",
+        expression: "(SingleProject | MultipleProjects) & Solidity",
+        termNames: new[] { "SingleProject", "MultipleProjects", "Solidity" },
+        termValues: new[] { SolutionHasSingleProject_string, SolutionHasMultipleProjects_string, "HierSingleSelectionName:package.json$" })]
     public sealed class StratisEVMPackage : AsyncPackage, IVsSolutionEvents7
     {
         /// <summary>
@@ -53,6 +58,8 @@ public sealed class StratisEVMPackage : AsyncPackage, IVsSolutionEvents7
         public const string PackageGuidString = "711b90a1-97e6-4b9a-91c4-3d62ccd32d4e";
 
         public const string SolidityFileUIContextRule = "82268519-FB9D-4B7E-8B01-2A311F4181E2";
+
+        public const string NPMFileUIContextRule = "9A7CA75A-FA6E-45B2-B6E9-4BFF0AB7BB88";
         #region Constructors
         static StratisEVMPackage()
         {