Merge pull request #23 from geo-at-github/master

unitycoder · web-flow · commit 8f9b534462b6 · 2018-01-26T19:58:52.000+08:00
Added robustness against corrupt ProjectVersion.txt files &amp; added resizeable columns
diff --git a/UnityLauncher/Form1.Designer.cs b/UnityLauncher/Form1.Designer.cs
diff --git a/UnityLauncher/Form1.cs b/UnityLauncher/Form1.cs
@@ -146,12 +146,12 @@ string GetProjectVersion(string path)
                         }
                         else
                         {
-                            throw new InvalidDataException("Cannot find m_EditorVersion:" + dd);
+                            MessageBox.Show("Cannot find m_EditorVersion in '" + versionPath + "'.\n\nFile Content:\n" + string.Join("\n", data).ToString());
                         }
                     }
                     else
                     {
-                        throw new InvalidDataException("invalid projectversion data:" + data.ToString());
+                        MessageBox.Show("Invalid projectversion data found in '" + versionPath + "'.\n\nFile Content:\n" + string.Join("\n", data).ToString());
                     }
                 }
             }
diff --git a/UnityLauncher/Form1.resx b/UnityLauncher/Form1.resx
@@ -132,33 +132,12 @@
   <metadata name="_dateModified.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="_project.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="_version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="_path.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="_dateModified.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="_unityVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="_unityPath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="_unityVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="_unityPath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>14, 20</value>
-  </metadata>
   <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>111, 20</value>
   </metadata>

Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,12 @@ string GetProjectVersion(string path)`
`146`	`146`	`}`
`147`	`147`	`else`
`148`	`148`	`{`
`149`		`- throw new InvalidDataException("Cannot find m_EditorVersion:" + dd);`
	`149`	`+ MessageBox.Show("Cannot find m_EditorVersion in '" + versionPath + "'.\n\nFile Content:\n" + string.Join("\n", data).ToString());`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- throw new InvalidDataException("invalid projectversion data:" + data.ToString());`
	`154`	`+ MessageBox.Show("Invalid projectversion data found in '" + versionPath + "'.\n\nFile Content:\n" + string.Join("\n", data).ToString());`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`}`