Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align dev with master #39

Merged
merged 2 commits into from
Sep 15, 2024
Merged

Align dev with master #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
299ec1d
Release 2.0.1 (#35)
hadarshjfrog Aug 27, 2024
ad8eb15
Align Dev with master (#37)
kerenr-jfrog Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions JFrogVSExtension/Utils/Util.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ public static async Task<string> GetProcessOutputAsync(string pathToExe, string
pProcess.Start();
pProcess.BeginOutputReadLine();
pProcess.BeginErrorReadLine();
// Waits for maximal 100 seconds.
pProcess.WaitForExit(100000);
// Waits for maximal 1 hour
pProcess.WaitForExit(60*60*1000);

// Wait for the entire output to be written
if (outputWaitHandle.WaitOne(1) &&
Expand Down
2 changes: 1 addition & 1 deletion JFrogVSExtension/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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="JFrogVSExtension.c07afb03-9f9a-45e2-8e6f-78442325bb24" Version="2.0.0" Language="en-US" Publisher="JFrog" />
<Identity Id="JFrogVSExtension.c07afb03-9f9a-45e2-8e6f-78442325bb24" Version="2.0.1" Language="en-US" Publisher="JFrog" />
<DisplayName>JFrog V2</DisplayName>
<Description xml:space="preserve">Visual Studio extension to integrate with JFrog Xray for scanning solution components. </Description>
<Icon>Resources\Icon.png</Icon>
Expand Down
4 changes: 4 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Release Notes

## 2.0.1 (Aug 27, 2024)
- Change Scan Timeout

## 2.0.0 (October 19, 2022)
- Add support for Xray's Watches.
- Add support for npm projects.
Expand Down
Loading