cosmetic changes

jfrog · Jan 12, 2025 · c961b61 · c961b61
1 parent 5689562
commit c961b61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/JFrogVSExtension/JFrogVSExtension.csproj b/JFrogVSExtension/JFrogVSExtension.csproj
@@ -248,10 +248,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0">
       <Version>17.1.32210.191</Version>
     </PackageReference>
-    <!-- 
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0">
-      <Version>17.12.40391</Version>
-    </PackageReference>  -->
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
       <Version>17.12.2069</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/JFrogVSExtension/MainPanelControl.xaml.cs b/JFrogVSExtension/MainPanelControl.xaml.cs
@@ -148,7 +148,7 @@ public async Task LoadAsync()
         {
             if (isAllFilterChecked)
             {
-                InitCheckbox(); 
+                InitCheckbox();
             }
         }
 

diff --git a/JFrogVSExtension/Utils/Util.cs b/JFrogVSExtension/Utils/Util.cs
@@ -57,17 +57,9 @@ private static Project LoadNpmProject(string packageJsonPath)
 
                 var npmProj = JsonConvert.DeserializeObject<NpmLsNode>(npmProjectTree.Result);
 
-                //JoinableTaskFactory joinableTaskFactory = new JoinableTaskFactory(ThreadHelper.JoinableTaskContext);
-
-                //var npmProj = joinableTaskFactory.Run(async () =>
-                //{
-                //    return await GetProcessOutputAsync("cmd.exe", "/C npm ls --json --all --long --package-lock-only", fileInfo.DirectoryName);
-                //});
-
-
                 var project = new Project()
                 {
-                    name = $"{npmProj.name}:{npmProj.version}", 
+                    name = $"{npmProj.name}:{npmProj.version}",
                     directoryPath = fileInfo.DirectoryName,
                     dependencies = new Dependency[] { },
                 };
@@ -115,13 +107,13 @@ public static async Task<string> GetCLIOutputAsync(string command, string workin
             var strFilePath = Path.Combine(strAppPath, "Resources");
             var pathToCli = Path.Combine(strFilePath, "jfrog.exe");
             await OutputLog.ShowMessageAsync("Path for the JFrog CLI: " + pathToCli);
-            return await Task.Run(async () => await GetProcessOutputAsync(pathToCli, command, workingDir, configCommand, envVars));
+            return await GetProcessOutputAsync(pathToCli, command, workingDir, configCommand, envVars);
         }
 
         public static async Task<string> GetProcessOutputAsync(string pathToExe, string command, string workingDir = "", bool configCommand = false, Dictionary<string, string> envVars = null)
         {
-            //return await Task.Run(async () =>
-            //{
+            return await Task.Run(async () =>
+            {
                 //Create process
                 Process pProcess = new Process
                 {
@@ -217,7 +209,7 @@ public static async Task<string> GetProcessOutputAsync(string pathToExe, string
                     await OutputLog.ShowMessageAsync("Process timeout");
                     throw new IOException($"Process timeout,  {pathToExe} {commandString}");
                 }
-            //});
+            });
         }
 
         private static string GetAssemblyLocalPathFrom(Type type)
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,7 +148,7 @@ public async Task LoadAsync() @@
             {
                 if (isAllFilterChecked)
                 {
-                    InitCheckbox();
+                    InitCheckbox();
                 }
             }
@@ Expand Down @@