Merge remote-tracking branch 'origin/roslyn' into new-project-model

1 files changed, 1 insertions, 12 deletions

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
index 96d24ff503..6968d7b776 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
@@ -50,7 +50,7 @@ namespace MonoDevelop.Core
 		static FileServiceErrorHandler errorHandler;

 		

 		static FileSystemExtension fileSystemChain;

-		static readonly FileSystemExtension defaultExtension = Platform.IsWindows ? new DefaultFileSystemExtension () : new UnixFileSystemExtension () ;

+		static readonly FileSystemExtension defaultExtension = new DefaultFileSystemExtension ();

 		

 		static readonly EventQueue eventQueue = new EventQueue ();

 		

@@ -90,17 +90,6 @@ namespace MonoDevelop.Core
 			}

 		}

 		

-		public static FilePath ResolveFullPath (FilePath path)

-		{

-			try {

-				return GetFileSystemForPath (path, false).ResolveFullPath (path);

-			} catch (Exception e) {

-				if (!HandleError (GettextCatalog.GetString ("Can't resolve full path {0}", path), e))

-					throw;

-				return FilePath.Empty;

-			}

-		}

-		

 		public static void DeleteFile (string fileName)

 		{

 			Debug.Assert (!String.IsNullOrEmpty (fileName));