From a7637a281d3c2d18308d233b842232cca39e8786 Mon Sep 17 00:00:00 2001 From: Amitai Lanciano Date: Mon, 9 May 2016 01:36:17 -0700 Subject: [PATCH 1/4] bump to version 1.0.0.4 --- Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj b/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj index e3cb627..46fbbe2 100644 --- a/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj +++ b/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj @@ -22,7 +22,7 @@ false false true - 3 + 4 1.0.0.%2a false true From 8f3f3c2e5a9ce97092a6e84ee22caac7a17e6f8d Mon Sep 17 00:00:00 2001 From: Amitai Lanciano Date: Wed, 11 May 2016 15:55:43 -0700 Subject: [PATCH 2/4] bump to 1.0.0.5 --- Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj | 2 +- Lanayo.VagrantManager/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj b/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj index e3cb627..4ccad20 100644 --- a/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj +++ b/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj @@ -22,7 +22,7 @@ false false true - 3 + 5 1.0.0.%2a false true diff --git a/Lanayo.VagrantManager/Properties/AssemblyInfo.cs b/Lanayo.VagrantManager/Properties/AssemblyInfo.cs index 9ad2040..710171e 100644 --- a/Lanayo.VagrantManager/Properties/AssemblyInfo.cs +++ b/Lanayo.VagrantManager/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.4")] -[assembly: AssemblyFileVersion("1.0.0.4")] +[assembly: AssemblyVersion("1.0.0.5")] +[assembly: AssemblyFileVersion("1.0.0.5")] From dcdc647f0664284358ed5d574144b55f0a2402d2 Mon Sep 17 00:00:00 2001 From: Mark Summers Date: Tue, 20 Sep 2016 17:07:29 +0100 Subject: [PATCH 3/4] Read stdout before WaitForExit() to prevent a possible deadlock: https://msdn.microsoft.com/en-us/library/system.diagnostics.process.standardoutput(v=vs.110).aspx --- .../Core/Providers/VagrantGlobalStatusScanner.cs | 2 +- .../Core/Providers/VirtualBoxServiceProvider.cs | 4 ++-- Lanayo.VagrantManager/Core/Vagrant/VagrantInstance.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lanayo.VagrantManager/Core/Providers/VagrantGlobalStatusScanner.cs b/Lanayo.VagrantManager/Core/Providers/VagrantGlobalStatusScanner.cs index 61fc8f6..c2cfa8a 100644 --- a/Lanayo.VagrantManager/Core/Providers/VagrantGlobalStatusScanner.cs +++ b/Lanayo.VagrantManager/Core/Providers/VagrantGlobalStatusScanner.cs @@ -25,8 +25,8 @@ public string[] GetInstancePaths() { }; p.Start(); - p.WaitForExit(); string outputString = p.StandardOutput.ReadToEnd(); + p.WaitForExit(); if (p.ExitCode == 0) { Regex regex = new Regex("(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+([A-Z]:/.*)(\\n|$)"); diff --git a/Lanayo.VagrantManager/Core/Providers/VirtualBoxServiceProvider.cs b/Lanayo.VagrantManager/Core/Providers/VirtualBoxServiceProvider.cs index bd7e144..c86dbe4 100644 --- a/Lanayo.VagrantManager/Core/Providers/VirtualBoxServiceProvider.cs +++ b/Lanayo.VagrantManager/Core/Providers/VirtualBoxServiceProvider.cs @@ -54,8 +54,8 @@ public string[] GetAllVirtualMachineUUIDs() { return uuids.ToArray(); } - p.WaitForExit(); string outputString = p.StandardOutput.ReadToEnd(); + p.WaitForExit(); if (p.ExitCode == 0) { Regex regex = new Regex("\"[^\"]+\"\\s+\\{([^\\}]+)\\}"); @@ -88,8 +88,8 @@ public VirtualBoxMachineInfo GetVirtualMachineInfoFromUUID(string uuid) { return null; } - p.WaitForExit(); string outputString = p.StandardOutput.ReadToEnd(); + p.WaitForExit(); if (p.ExitCode == 0) { return new VirtualBoxMachineInfo(outputString); diff --git a/Lanayo.VagrantManager/Core/Vagrant/VagrantInstance.cs b/Lanayo.VagrantManager/Core/Vagrant/VagrantInstance.cs index 3f44b00..e6b10dd 100644 --- a/Lanayo.VagrantManager/Core/Vagrant/VagrantInstance.cs +++ b/Lanayo.VagrantManager/Core/Vagrant/VagrantInstance.cs @@ -75,8 +75,8 @@ public void QueryMachines() { }; p.Start(); - p.WaitForExit(); string outputString = p.StandardOutput.ReadToEnd(); + p.WaitForExit(); Regex regex = new Regex("([\\w-_\\.]+)\\s+([\\w\\s]+) \\(\\w+\\)"); MatchCollection matchCollection = regex.Matches(outputString); From 6be1f2fd5c1f6225115038d79c1b1df5800be2ef Mon Sep 17 00:00:00 2001 From: Amitai Lanciano Date: Tue, 20 Sep 2016 11:06:13 -0700 Subject: [PATCH 4/4] increase default size of task output window and center it in the middle of the screen --- .../Windows/TaskOutputWindow.Designer.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Lanayo.VagrantManager/Windows/TaskOutputWindow.Designer.cs b/Lanayo.VagrantManager/Windows/TaskOutputWindow.Designer.cs index 599cecd..0699105 100644 --- a/Lanayo.VagrantManager/Windows/TaskOutputWindow.Designer.cs +++ b/Lanayo.VagrantManager/Windows/TaskOutputWindow.Designer.cs @@ -48,7 +48,7 @@ private void InitializeComponent() { this.TaskProgressBar.Location = new System.Drawing.Point(16, 30); this.TaskProgressBar.MarqueeAnimationSpeed = 10; this.TaskProgressBar.Name = "TaskProgressBar"; - this.TaskProgressBar.Size = new System.Drawing.Size(365, 23); + this.TaskProgressBar.Size = new System.Drawing.Size(756, 23); this.TaskProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee; this.TaskProgressBar.TabIndex = 1; // @@ -62,7 +62,7 @@ private void InitializeComponent() { this.TaskCommandTextBox.Location = new System.Drawing.Point(16, 60); this.TaskCommandTextBox.Name = "TaskCommandTextBox"; this.TaskCommandTextBox.ReadOnly = true; - this.TaskCommandTextBox.Size = new System.Drawing.Size(365, 20); + this.TaskCommandTextBox.Size = new System.Drawing.Size(756, 20); this.TaskCommandTextBox.TabIndex = 2; this.TaskCommandTextBox.Text = "Task Command"; // @@ -70,7 +70,7 @@ private void InitializeComponent() { // this.CloseWindowButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.CloseWindowButton.Enabled = false; - this.CloseWindowButton.Location = new System.Drawing.Point(260, 288); + this.CloseWindowButton.Location = new System.Drawing.Point(651, 526); this.CloseWindowButton.Name = "CloseWindowButton"; this.CloseWindowButton.Size = new System.Drawing.Size(120, 23); this.CloseWindowButton.TabIndex = 4; @@ -81,7 +81,7 @@ private void InitializeComponent() { // CancelTaskButton // this.CancelTaskButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.CancelTaskButton.Location = new System.Drawing.Point(179, 288); + this.CancelTaskButton.Location = new System.Drawing.Point(570, 526); this.CancelTaskButton.Name = "CancelTaskButton"; this.CancelTaskButton.Size = new System.Drawing.Size(75, 23); this.CancelTaskButton.TabIndex = 5; @@ -102,14 +102,14 @@ private void InitializeComponent() { this.OutputTextBox.Name = "OutputTextBox"; this.OutputTextBox.ReadOnly = true; this.OutputTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.OutputTextBox.Size = new System.Drawing.Size(364, 195); + this.OutputTextBox.Size = new System.Drawing.Size(755, 433); this.OutputTextBox.TabIndex = 6; // // TaskOutputWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(393, 323); + this.ClientSize = new System.Drawing.Size(784, 561); this.Controls.Add(this.OutputTextBox); this.Controls.Add(this.CancelTaskButton); this.Controls.Add(this.CloseWindowButton); @@ -119,6 +119,7 @@ private void InitializeComponent() { this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MinimumSize = new System.Drawing.Size(409, 362); this.Name = "TaskOutputWindow"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Task"; this.Load += new System.EventHandler(this.TaskOutputWindow_Load); this.ResumeLayout(false);