Replace FileUtility.Combine with Path.Combine.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5187 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs

@@ -21,4 +21,3 @@ using System.Security.Permissions;
 [assembly: AssemblyCulture("")]
 
 [assembly: System.CLSCompliant(false)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]

src/Main/Base/Project/Src/Internal/ExternalTool/ToolLoader.cs

@@ -83,7 +83,7 @@ namespace ICSharpCode.SharpDevelop.Internal.ExternalTool
 		static ToolLoader()
 		{
 			if (!LoadToolsFromStream(Path.Combine(PropertyService.ConfigDirectory, TOOLFILE))) {
-				if (!LoadToolsFromStream(FileUtility.Combine(PropertyService.DataDirectory, "options", TOOLFILE))) {
+				if (!LoadToolsFromStream(Path.Combine(PropertyService.DataDirectory, "options", TOOLFILE))) {
 					MessageService.ShowWarning("${res:Internal.ExternalTool.CantLoadToolConfigWarining}");
 				}
 			}

src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs

@@ -290,7 +290,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		
 		public static void UpdateTemplates()
 		{
-			string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "file");
+			string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "file");
 			List<string> files = FileUtility.SearchDirectory(dataTemplateDir, "*.xft");
 			foreach (string templateDirectory in AddInTree.BuildItems<string>(ProjectTemplate.TemplatePath, null, false)) {
 				if (!Directory.Exists(templateDirectory))

src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs

@@ -249,7 +249,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 						string fileName = el.GetAttribute("filename");
 						return projectCreateInformation => {
 							string parsedFileName = StringParser.Parse(fileName, new string[,] { {"ProjectName", projectCreateInformation.ProjectName} });
-							string path = FileUtility.Combine(projectCreateInformation.ProjectBasePath, parsedFileName);
+							string path = Path.Combine(projectCreateInformation.ProjectBasePath, parsedFileName);
 							FileService.OpenFile(path);
 						};
 					} else {
@@ -343,7 +343,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		public static void UpdateTemplates()
 		{
 			projectTemplates = new List<ProjectTemplate>();
-			string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "project");
+			string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "project");
 			List<string> files = FileUtility.SearchDirectory(dataTemplateDir, "*.xpt");
 			foreach (string templateDirectory in AddInTree.BuildItems<string>(TemplatePath, null, false)) {
 				files.AddRange(FileUtility.SearchDirectory(templateDirectory, "*.xpt"));

src/Main/Base/Project/Src/Internal/Templates/StandardHeaders.cs

@@ -76,7 +76,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		{
 			
 			if (!LoadHeaders(Path.Combine(PropertyService.ConfigDirectory, TemplateFileName))) {
-				if (!LoadHeaders(FileUtility.Combine(PropertyService.DataDirectory,  "options", TemplateFileName))) {
+				if (!LoadHeaders(Path.Combine(PropertyService.DataDirectory,  "options", TemplateFileName))) {
 					MessageService.ShowWarning("Can not load standard headers");
 				}
 			}

src/Main/Base/Project/Src/Internal/Templates/TemplateCategorySortOrderFile.cs

@@ -118,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		static void ReadProjectCategorySortOrderFiles()
 		{
 			projectCategorySortOrderFiles = new List<TemplateCategorySortOrderFile>();
-			string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "project");
+			string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "project");
 			List<string> files = FileUtility.SearchDirectory(dataTemplateDir, ProjectCategorySortOrderFileName);
 			foreach (string templateDirectory in AddInTree.BuildItems<string>(ProjectTemplate.TemplatePath, null, false)) {
 				files.AddRange(FileUtility.SearchDirectory(templateDirectory, ProjectCategorySortOrderFileName));
@@ -135,7 +135,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		static void ReadFileCategorySortOrderFiles()
 		{
 			fileCategorySortOrderFiles = new List<TemplateCategorySortOrderFile>();
-			string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "file");
+			string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "file");
 			List<string> files = FileUtility.SearchDirectory(dataTemplateDir, FileCategorySortOrderFileName);
 			foreach (string templateDirectory in AddInTree.BuildItems<string>(ProjectTemplate.TemplatePath, null, false)) {
 				files.AddRange(FileUtility.SearchDirectory(templateDirectory, FileCategorySortOrderFileName));

src/Main/Base/Project/Src/Internal/Templates/TextTemplate.cs

@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Xml;
 
 using ICSharpCode.Core;
@@ -78,7 +79,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		
 		static TextTemplate()
 		{
-			List<string> files = FileUtility.SearchDirectory(FileUtility.Combine(PropertyService.DataDirectory, "options", "textlib"), "*.xml");
+			List<string> files = FileUtility.SearchDirectory(Path.Combine(PropertyService.DataDirectory, "options", "textlib"), "*.xml");
 			foreach (string file in files) {
 				LoadTextTemplate(file);
 			}

src/Main/Base/Project/Src/Services/Language/LanguageService.cs

@@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop
 {
 	public static class LanguageService
 	{
-		static string languagePath = FileUtility.Combine(PropertyService.DataDirectory, "resources", "languages");
+		static string languagePath = Path.Combine(PropertyService.DataDirectory, "resources", "languages");
 		
 		static ImageList languageImageList = null;
 		static ArrayList languages         = null;

src/Main/Core/Project/Src/AddInTree/CoreStartup.cs

@@ -205,7 +205,7 @@ namespace ICSharpCode.Core
 			                                  dataDirectory ?? Path.Combine(FileUtility.ApplicationRootPath, "data"),
 			                                  propertiesName);
 			PropertyService.Load();
-			ResourceService.InitializeService(FileUtility.Combine(PropertyService.DataDirectory, "resources"));
+			ResourceService.InitializeService(Path.Combine(PropertyService.DataDirectory, "resources"));
 			StringParser.RegisterStringTagProvider(new AppNameProvider { appName = applicationName });
 		}
 		

src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs

@@ -146,6 +146,7 @@ namespace ICSharpCode.Core
 		
 		#endregion
 		
+		[Obsolete("Use System.IO.Path.Combine instead")]
 		public static string Combine(params string[] paths)
 		{
 			if (paths == null || paths.Length == 0) {

src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs

@@ -83,7 +83,7 @@ namespace ICSharpCode.Core
 			}
 			
 			if (!LoadPropertiesFromStream(Path.Combine(configDirectory, propertyFileName))) {
-				LoadPropertiesFromStream(FileUtility.Combine(DataDirectory, "options", propertyFileName));
+				LoadPropertiesFromStream(Path.Combine(DataDirectory, "options", propertyFileName));
 			}
 		}
 		

src/Main/ICSharpCode.SharpDevelop.Sda/Configuration/AssemblyInfo.cs

@@ -21,4 +21,3 @@ using System.Security.Permissions;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, Unrestricted=true)]