From 19457ff0f8b8497629749b389d62c2c175094a80 Mon Sep 17 00:00:00 2001
From: Michael Hutchinson <m.j.hutchinson@gmail.com>
Date: Thu, 22 Aug 2013 15:04:12 -0400
Subject: [Core] Minor cleanup in MonoDevelop.Core.Assemblies

---
 .../MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs        | 13 ++++++-------
 .../MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs |  2 +-
 .../MonoDevelop.Core.Assemblies/SystemAssemblyService.cs    | 10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'main/src')

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
index 26f9639050..80bdbd27d4 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
@@ -44,14 +44,13 @@ namespace MonoDevelop.Core.Assemblies
 {
 	public class MonoTargetRuntime: TargetRuntime
 	{
-		string monoVersion;
-		string monoDir;
+		readonly string monoVersion,  monoDir;
 		MonoPlatformExecutionHandler execHandler;
-		Dictionary<string,string> environmentVariables;
+		readonly Dictionary<string,string> environmentVariables;
 		
 		internal static LibraryPcFileCache PcFileCache = new LibraryPcFileCache (new PcFileCacheContext ());
 		
-		MonoRuntimeInfo monoRuntimeInfo;
+		readonly MonoRuntimeInfo monoRuntimeInfo;
 		
 		internal MonoTargetRuntime (MonoRuntimeInfo info)
 		{
@@ -154,7 +153,7 @@ namespace MonoDevelop.Core.Assemblies
 			return execHandler;
 		}
 		
-		protected override void ConvertAssemblyProcessStartInfo (System.Diagnostics.ProcessStartInfo pinfo)
+		protected override void ConvertAssemblyProcessStartInfo (ProcessStartInfo pinfo)
 		{
 			pinfo.Arguments = "\"" + pinfo.FileName + "\" " + pinfo.Arguments;
 			pinfo.FileName = Path.Combine (Path.Combine (MonoRuntimeInfo.Prefix, "bin"), "mono");
@@ -205,10 +204,10 @@ namespace MonoDevelop.Core.Assemblies
 		public string PkgConfigPath {
 			get { return environmentVariables ["PKG_CONFIG_PATH"]; }
 		}
-		
+
 		public IEnumerable<string> GetAllPkgConfigFiles ()
 		{
-			HashSet<string> packageNames = new HashSet<string> ();
+			var packageNames = new HashSet<string> ();
 			foreach (string pcdir in PkgConfigDirs) {
 				string[] files;
 				try {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs
index 04153466df..59d24774ad 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs
@@ -62,7 +62,7 @@ namespace MonoDevelop.Core.Assemblies
 				if (!Directory.Exists (MAC_FRAMEWORK_DIR))
 					yield break;
 				foreach (string dir in Directory.GetDirectories (MAC_FRAMEWORK_DIR)) {
-					if (dir.EndsWith ("/Current") || currentRuntime.Prefix == dir)
+					if (dir.EndsWith ("/Current", StringComparison.Ordinal) || currentRuntime.Prefix == dir)
 						continue;
 					MonoRuntimeInfo info = new MonoRuntimeInfo (dir);
 					if (info.IsValidRuntime)
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
index a7adb8224e..f407e03c4b 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
@@ -214,9 +214,9 @@ namespace MonoDevelop.Core.Assemblies
 			return null;
 		}
 
-		public static System.Reflection.AssemblyName ParseAssemblyName (string fullname)
+		public static AssemblyName ParseAssemblyName (string fullname)
 		{
-			var aname = new System.Reflection.AssemblyName ();
+			var aname = new AssemblyName ();
 			int i = fullname.IndexOf (',');
 			if (i == -1) {
 				aname.Name = fullname.Trim ();
@@ -224,7 +224,7 @@ namespace MonoDevelop.Core.Assemblies
 			}
 			
 			aname.Name = fullname.Substring (0, i).Trim ();
-			i = fullname.IndexOf ("Version", i+1);
+			i = fullname.IndexOf ("Version", i + 1, StringComparison.Ordinal);
 			if (i == -1)
 				return aname;
 			i = fullname.IndexOf ('=', i);
@@ -238,7 +238,7 @@ namespace MonoDevelop.Core.Assemblies
 			return aname;
 		}
 		
-		static Dictionary<string, AssemblyName> assemblyNameCache = new Dictionary<string, AssemblyName> ();
+		static readonly Dictionary<string, AssemblyName> assemblyNameCache = new Dictionary<string, AssemblyName> ();
 		internal static AssemblyName GetAssemblyNameObj (string file)
 		{
 			AssemblyName name;
@@ -351,7 +351,7 @@ namespace MonoDevelop.Core.Assemblies
 					}
 				}
 			} catch (Exception ex) {
-				LoggingService.LogError ("Error to determine target framework for assembly {0}: {1}", file, ex);
+				LoggingService.LogError ("Error determining target framework for assembly {0}: {1}", file, ex);
 				return TargetFrameworkMoniker.UNKNOWN;
 			} finally {
 				universe.Dispose ();
-- 
cgit v1.2.3