diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin index 4b01c46240..75d13646cd 100644 --- a/AddIns/ICSharpCode.SharpDevelop.addin +++ b/AddIns/ICSharpCode.SharpDevelop.addin @@ -97,7 +97,7 @@ diff --git a/data/options/SharpDevelop-tools.xml b/data/options/SharpDevelop-tools.xml index 1cd1259812..53ed78d717 100644 --- a/data/options/SharpDevelop-tools.xml +++ b/data/options/SharpDevelop-tools.xml @@ -6,17 +6,10 @@ Notepad False - - ${TargetDir} - "/R:${TargetPath}" "/W:${TargetDir}" - ${StartupPath}\nprof\NProf.Application.exe - NProf - True - ${TargetDir} "${TargetPath}" - ILDasm.exe + ${NetSdkDir}bin\ILDasm.exe IL Dasm False diff --git a/data/resources/StringResources.de.resources b/data/resources/StringResources.de.resources index 0890bfc345..c9b36e67f0 100644 Binary files a/data/resources/StringResources.de.resources and b/data/resources/StringResources.de.resources differ diff --git a/data/resources/image/BitmapResources/BitmapResources.res b/data/resources/image/BitmapResources/BitmapResources.res index 736612b8f3..d9e9481224 100644 --- a/data/resources/image/BitmapResources/BitmapResources.res +++ b/data/resources/image/BitmapResources/BitmapResources.res @@ -233,7 +233,8 @@ PadIcons.ErrorList = PadIcons\ErrorList.png PadIcons.TaskList = PadIcons\TaskList.png PadIcons.Output = PadIcons\Output.png PadIcons.Toolbar = PadIcons\Toolbar.png -PadIcons.UnitTest = PadIcons\UnitTest.png +PadIcons.NUnitTest = PadIcons\NUnit.png +PadIcons.MbUnitTest = PadIcons\MbUnit.png PadIcons.FindResults = PadIcons\FindResults.png PadIcons.FileBrowser = PadIcons\FileBrowser.png PadIcons.ClassBrowser = PadIcons\ClassBrowser.png diff --git a/data/resources/image/BitmapResources/PadIcons/MbUnit.png b/data/resources/image/BitmapResources/PadIcons/MbUnit.png new file mode 100644 index 0000000000..6f553eaff3 Binary files /dev/null and b/data/resources/image/BitmapResources/PadIcons/MbUnit.png differ diff --git a/data/resources/image/BitmapResources/PadIcons/UnitTest.png b/data/resources/image/BitmapResources/PadIcons/NUnit.png similarity index 100% rename from data/resources/image/BitmapResources/PadIcons/UnitTest.png rename to data/resources/image/BitmapResources/PadIcons/NUnit.png diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs index 43afacb208..fa29b15364 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs @@ -30,6 +30,7 @@ namespace HtmlHelp2Service { SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("HtmlHelp2.Resources.HtmlHelp2Options.xfrm")); ControlDictionary["reregisterButton"].Click += ReregisterButtonClick; + ControlDictionary["reregisterButton"].Visible = false; this.InitializeComponents(); } diff --git a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs index ba64bf91c5..efd39dcf1c 100644 --- a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// +// // 2002-2005 AlphaSierraPapa // GNU General Public License // diff --git a/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin b/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin index 2f914b2d95..ea4e70f937 100644 --- a/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin +++ b/src/AddIns/Misc/MbUnitPad/Project/MbUnitPad.addin @@ -15,7 +15,7 @@ @@ -36,7 +36,7 @@ tooltip = "${res:MbUnitPad.ReferenceItem}" class = "ICSharpCode.MbUnitPad.AddMbUnitReferenceCommand"/> diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index bda8322de8..9dd26cfb97 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -229,7 +229,6 @@ UserControl - UserControl @@ -482,7 +481,6 @@ - diff --git a/src/Main/Base/Project/Resources/ProjectAndCombineOptions.xfrm b/src/Main/Base/Project/Resources/ProjectAndCombineOptions.xfrm deleted file mode 100644 index c66408dbeb..0000000000 --- a/src/Main/Base/Project/Resources/ProjectAndCombineOptions.xfrm +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs b/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs index 45b2178d72..0c8f86d24e 100644 --- a/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs +++ b/src/Main/Base/Project/Src/Commands/CustomStringTagProvider.cs @@ -21,9 +21,9 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.SharpDevelop.Commands { - public class SharpDevelopStringTagProvider : IStringTagProvider + public class SharpDevelopStringTagProvider : IStringTagProvider { - readonly static string[] tags = new string[] { + readonly static string[] tags = new string[] { "ItemPath", "ItemDir", "ItemFilename", "ItemExt", "CurLine", "CurCol", "CurText", "TargetPath", "TargetDir", "TargetName", "TargetExt", @@ -31,9 +31,9 @@ namespace ICSharpCode.SharpDevelop.Commands "ProjectDir", "ProjectFilename", "CombineDir", "CombineFilename", "Startuppath", - "TaskService.Warnings", "TaskService.Errors", "TaskService.Messages" + "TaskService.Warnings", "TaskService.Errors", "TaskService.Messages", + "NetSdkDir" }; - public string[] Tags { get { @@ -51,14 +51,13 @@ namespace ICSharpCode.SharpDevelop.Commands string GetCurrentTargetPath() { -// TODO: -// if (ProjectService.CurrentProject != null) { -// return ProjectService.GetOutputAssemblyName(ProjectService.CurrentProject); -// } -// if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) { -// string fileName = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.FileName; -// return ProjectService.GetOutputAssemblyName(fileName); -// } + if (ProjectService.CurrentProject != null) { + return ProjectService.CurrentProject.OutputAssemblyFullPath; + } + /*if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) { + string fileName = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.FileName; + return ProjectService.GetOutputAssemblyName(fileName); + }*/ return String.Empty; } @@ -77,7 +76,8 @@ namespace ICSharpCode.SharpDevelop.Commands } switch (tag.ToUpper()) { - + case "NETSDKDIR": + return FileUtility.NetSdkInstallRoot; case "ITEMPATH": try { return GetCurrentItemPath(); @@ -98,15 +98,15 @@ namespace ICSharpCode.SharpDevelop.Commands return Path.GetExtension(GetCurrentItemPath()); } catch (Exception) {} break; - - // TODO: + + // TODO: case "CURLINE": return String.Empty; case "CURCOL": return String.Empty; case "CURTEXT": return String.Empty; - + case "TARGETPATH": try { return GetCurrentTargetPath(); @@ -127,7 +127,7 @@ namespace ICSharpCode.SharpDevelop.Commands return Path.GetExtension(GetCurrentTargetPath()); } catch (Exception) {} break; - + case "PROJECTDIR": if (ProjectService.CurrentProject != null) { return ProjectService.CurrentProject.FileName; @@ -140,7 +140,7 @@ namespace ICSharpCode.SharpDevelop.Commands } catch (Exception) {} } break; - + case "COMBINEDIR": return Path.GetDirectoryName(ProjectService.OpenSolution.FileName); case "COMBINEFILENAME": diff --git a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs index 54921e72ad..baaede7c65 100644 --- a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs +++ b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs @@ -170,8 +170,7 @@ namespace ICSharpCode.SharpDevelop.Commands } process.Start(); } catch (Exception ex) { - - MessageService.ShowError(ex, "External program execution failed.\nError while starting:\n '" + command + " " + args + "'"); + MessageService.ShowError("External program execution failed.\nError while starting:\n '" + command + " " + args + "'\n" + ex.Message); } break; } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs deleted file mode 100644 index 1e2e474720..0000000000 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs +++ /dev/null @@ -1,86 +0,0 @@ -//// -//// -//// -//// -//// -//// -// -//using System; -//using System.IO; -//using System.Drawing; -//using System.Collections; -//using System.Windows.Forms; -// -//using ICSharpCode.SharpDevelop.Internal.ExternalTool; -//using ICSharpCode.Core; -//using ICSharpCode.Core; -//using ICSharpCode.SharpDevelop.Gui; -//using ICSharpCode.Core; -//using ICSharpCode.Core; -//using ICSharpCode.Core; -// -//namespace ICSharpCode.SharpDevelop.Gui.OptionPanels -//{ -// public class ProjectAndCombinePanel : AbstractOptionPanel -// { -// public override void LoadPanelContents() -// { -// SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ProjectAndCombineOptions.xfrm")); -// -// // read properties -// ControlDictionary["projectLocationTextBox"].Text = PropertyService.Get("ICSharpCode.SharpDevelop.Gui.NewProjectDialog.DefaultPath", Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), -// "SharpDevelop Projects")).ToString(); -// -// BeforeCompileAction action = (BeforeCompileAction)PropertyService.Get("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles); -// -// ((RadioButton)ControlDictionary["saveChangesRadioButton"]).Checked = action == BeforeCompileAction.SaveAllFiles; -// ((RadioButton)ControlDictionary["promptChangesRadioButton"]).Checked = action == BeforeCompileAction.PromptForSave; -// ((RadioButton)ControlDictionary["noSaveRadioButton"]).Checked = action == BeforeCompileAction.Nothing; -// -// ((CheckBox)ControlDictionary["loadPrevProjectCheckBox"]).Checked = (bool)PropertyService.Get("SharpDevelop.LoadPrevProjectOnStartup", false); -// -// ((CheckBox)ControlDictionary["showTaskListCheckBox"]).Checked = (bool)PropertyService.Get("SharpDevelop.ShowTaskListAfterBuild", true); -// ((CheckBox)ControlDictionary["showOutputCheckBox"]).Checked = (bool)PropertyService.Get("SharpDevelop.ShowOutputWindowAtBuild", true); -// -// ((Button)ControlDictionary["selectProjectLocationButton"]).Click += new EventHandler(SelectProjectLocationButtonClicked); -// } -// -// public override bool StorePanelContents() -// { -// // check for correct settings -// string projectPath = ControlDictionary["projectLocationTextBox"].Text; -// if (projectPath.Length > 0) { -// if (!FileUtility.IsValidFileName(projectPath)) { -// MessageService.ShowError("Invalid project path specified"); -// return false; -// } -// } -// -// // set properties -// PropertyService.Set("ICSharpCode.SharpDevelop.Gui.NewProjectDialog.DefaultPath", projectPath); -// -// if (((RadioButton)ControlDictionary["saveChangesRadioButton"]).Checked) { -// PropertyService.Set("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.SaveAllFiles); -// } else if (((RadioButton)ControlDictionary["promptChangesRadioButton"]).Checked) { -// PropertyService.Set("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.PromptForSave); -// } else if (((RadioButton)ControlDictionary["noSaveRadioButton"]).Checked) { -// PropertyService.Set("SharpDevelop.Services.ParserService.BeforeCompileAction", BeforeCompileAction.Nothing); -// } -// -// PropertyService.Set("SharpDevelop.LoadPrevProjectOnStartup", ((CheckBox)ControlDictionary["loadPrevProjectCheckBox"]).Checked); -// -// PropertyService.Set("SharpDevelop.ShowTaskListAfterBuild", ((CheckBox)ControlDictionary["showTaskListCheckBox"]).Checked); -// PropertyService.Set("SharpDevelop.ShowOutputWindowAtBuild", ((CheckBox)ControlDictionary["showOutputCheckBox"]).Checked); -// -// return true; -// } -// -// void SelectProjectLocationButtonClicked(object sender, EventArgs e) -// { -// FolderDialog fdiag = new FolderDialog(); -// if (fdiag.DisplayDialog("Select default combile location") == DialogResult.OK) { -// ControlDictionary["projectLocationTextBox"].Text = fdiag.Path; -// } -// } -// } -//} diff --git a/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs b/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs index da148afd9e..442a8a2b3d 100644 --- a/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs +++ b/src/Main/Base/Project/Src/Services/ClassBrowserIcons/ClassBrowserIconService.cs @@ -218,7 +218,7 @@ namespace ICSharpCode.Core imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.ResourceFileIcon")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Event")); - imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Debug.Start")); + imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.SelectionArrow")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.CombineIcon")); imglist.Images.Add(ResourceService.GetBitmap("Icons.16x16.Literal")); diff --git a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs index 661ddde7f4..7f28173377 100644 --- a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs +++ b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs @@ -68,9 +68,19 @@ namespace ICSharpCode.Core public static string NETFrameworkInstallRoot { get { - RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework"); - object o = installRootKey.GetValue("InstallRoot"); - return o == null ? String.Empty : o.ToString(); + using (RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework")) { + object o = installRootKey.GetValue("InstallRoot"); + return o == null ? String.Empty : o.ToString(); + } + } + } + + public static string NetSdkInstallRoot { + get { + using (RegistryKey installRootKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\.NETFramework")) { + object o = installRootKey.GetValue("sdkInstallRootv2.0"); + return o == null ? String.Empty : o.ToString(); + } } } diff --git a/src/Main/StartUp/Project/Resources/BitmapResources.resources b/src/Main/StartUp/Project/Resources/BitmapResources.resources index 4d26acbb9b..2f574c019c 100644 Binary files a/src/Main/StartUp/Project/Resources/BitmapResources.resources and b/src/Main/StartUp/Project/Resources/BitmapResources.resources differ diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources index 68097a2854..ed13bac3ea 100644 Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index 7509014a0b..e0d28bfc23 100644 --- a/src/SharpDevelop.sln +++ b/src/SharpDevelop.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# SharpDevelop 2.0.0.348 +# SharpDevelop 2.0.0.373 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection