Commit 0f1929a

committed

Fix: suggest upgrade version for project with missing Unity installation (#192)

1 parent 3f05e25 commit 0f1929aCopy full SHA for 0f1929a

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,14 +413,14 @@ static bool CheckCrashBackupScene(string projectPath)`
`413`	`413`	`{`
`414`	`414`	`Int32 unixTimestamp = (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;`
`415`	`415`	`var uniqueFileName = "Recovered_Scene" + unixTimestamp + ".unity";`
`416`		`-`
	`416`	`+`
`417`	`417`	`try`
`418`	`418`	`{`
`419`	`419`	`File.Move(recoveryFile, Path.Combine(restoreFolder, uniqueFileName));`
`420`	`420`	`// remove folder, otherwise unity 6000.2 asks for recovery`
`421`	`421`	`Directory.Delete(Path.Combine(projectPath, "Temp", "__Backupscenes"), true);`
`422`	`422`
`423`		`- Console.WriteLine("moved file to "+ uniqueFileName);`
	`423`	`+ Console.WriteLine("moved file to "+ uniqueFileName);`
`424`	`424`	`}`
`425`	`425`	`catch (IOException)`
`426`	`426`	`{`
`@@ -1130,8 +1130,7 @@ public static string FindNearestVersion(string currentVersion, List<string> allA`
`1130`	`1130`	`string result = null;`
`1131`	`1131`
`1132`	`1132`	`// add current version to list, to sort it with others`
`1133`		`- if (!allAvailable.Contains(currentVersion))`
`1134`		`- allAvailable.Add(currentVersion);`
	`1133`	`+ if (!allAvailable.Contains(currentVersion)) allAvailable.Add(currentVersion);`
`1135`	`1134`
`1136`	`1135`	`// sort list`
`1137`	`1136`	`if (checkBelow)`
`@@ -1181,6 +1180,7 @@ public static long VersionAsLong(string version)`
`1181`	`1180`	`multiplier *= 50;`
`1182`	`1181`	`}`
`1183`	`1182`	`}`
	`1183`	`+`
`1184`	`1184`	`return result;`
`1185`	`1185`	`}`
`1186`	`1186`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,11 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi`
`37`	`37`	`txtCurrentVersion.BorderBrush = Brushes.Red;`
`38`	`38`	`txtCurrentVersion.BorderThickness = new Thickness(1);`
`39`	`39`	`}`
`40`		`- else // not null`
	`40`	`+`
	`41`	`+ if (currentVersion != null)`
`41`	`42`	`{`
`42`	`43`	`// remove china c1 from version`
`43`		`- if (currentVersion.Contains('c')) currentVersion = currentVersion.Replace("c1", "");`
	`44`	`+ if (currentVersion.Contains("c")) currentVersion = currentVersion.Replace("c1", "");`
`44`	`45`	`// find nearest version`
`45`	`46`	`string nearestVersion = Tools.FindNearestVersion(currentVersion, MainWindow.unityInstalledVersions.Keys.ToList());`
`46`	`47`

Comments

(0)