Merge pull request #1 from lanayotech/develop

sync from base
snzip · Oct 23, 2016 · e8fb9f5 · e8fb9f5
2 parents 590de36 + 6be1f2f
commit e8fb9f5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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);

diff --git a/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj b/Lanayo.VagrantManager/Lanayo.Vagrant_Manager.csproj
@@ -22,7 +22,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>5</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git 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")]
diff --git a/Lanayo.VagrantManager/Windows/TaskOutputWindow.Designer.cs b/Lanayo.VagrantManager/Windows/TaskOutputWindow.Designer.cs