Refactor FindDotNetExeDirectory

ICSharpCode.Decompiler/DotNetCore/DotNetCorePathFinder.cs

@@ -112,19 +112,12 @@ namespace ICSharpCode.Decompiler
 
 		static string FindDotNetExeDirectory()
 		{
-			char separator;
+			string dotnetExeName = (Environment.OSVersion.Platform == PlatformID.Unix) ? "dotnet" : "dotnet.exe";
-			string dotnetExeName;
+			foreach (var item in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator)) {
-			if (Environment.OSVersion.Platform == PlatformID.Unix) {
+				try {
-				separator = ':';
+					if (File.Exists(Path.Combine(item, dotnetExeName)))
-				dotnetExeName = "dotnet";
+						return item;
-			} else {
+				} catch (ArgumentException) { }
-				separator = ';';
-				dotnetExeName = "dotnet.exe";
-			}
-			foreach (var item in Environment.GetEnvironmentVariable("PATH").Split(separator)) {
-				var path = Environment.ExpandEnvironmentVariables(item);
-				if (File.Exists(Path.Combine(path, dotnetExeName)))
-					return path;
 			}
 			return null;
 		}