diff --git a/src/AddIns/BackendBindings/CPPNetBinding/Project/Src/AssemblyInfo.cs b/src/AddIns/BackendBindings/CPPNetBinding/Project/Src/AssemblyInfo.cs index 4aeb831d51..3ee3fc7ef1 100644 --- a/src/AddIns/BackendBindings/CPPNetBinding/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/CPPNetBinding/Project/Src/AssemblyInfo.cs @@ -23,7 +23,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs index 2ee0462783..b3e99418aa 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs index c5978b58fc..8a7cfc32e4 100644 --- a/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs @@ -23,7 +23,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs index 2ee7899a50..409ab646e9 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/AssemblyInfo.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/AssemblyInfo.cs index ef85dbc7e0..fa918ce8bc 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/AssemblyInfo.cs @@ -23,7 +23,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/DisplayBindings/AssemblyScout/Project/Src/AssemblyInfo.cs b/src/AddIns/DisplayBindings/AssemblyScout/Project/Src/AssemblyInfo.cs index acf091eee9..55f1b1d07a 100644 --- a/src/AddIns/DisplayBindings/AssemblyScout/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/AssemblyScout/Project/Src/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs index a508eedab6..9af5586429 100644 --- a/src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs index c55c19773a..e568ca4e0d 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs index 42107d5f84..b325bae819 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs b/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs index 42107d5f84..b325bae819 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs b/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs index 8efe7482a7..5f89188679 100644 --- a/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs +++ b/src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs index 3b9814de85..f6719048ec 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.CompilerServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs index 8338b0c240..3aeb11fa6e 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.CompilerServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs index d552a39b0b..474b7cbd22 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs index ac456c699c..972c8ce617 100644 --- a/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs index 704af0fd54..53cb433b51 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs @@ -31,7 +31,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs index 7ac9cc1f34..dbd647e05b 100644 --- a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs @@ -23,5 +23,5 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] diff --git a/src/AddIns/Misc/NUnitPad/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/NUnitPad/Project/Configuration/AssemblyInfo.cs deleted file mode 100644 index ca4ab02ff1..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/Configuration/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following -// attributes. -// -// change them to the information which is associated with the assembly -// you compile. - -[assembly: AssemblyTitle("NUnitPad Addin")] -[assembly: AssemblyDescription("Addin to launch NUnit tests inside SharpDevelop")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("www.icsharpcode.net")] -[assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has following format : -// -// Major.Minor.Build.Revision -// -// You can specify all values by your own or you can build default build and revision -// numbers with the '*' character (the default): - -[assembly: AssemblyVersion("2.0.0.348")] - -// The following attributes specify the key for the sign of your assembly. See the -// .NET Framework documentation for more information about signing. -// This is not required, if you don't want signing let these attributes like they're. -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] diff --git a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin deleted file mode 100644 index a35d729fb4..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.addin +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj deleted file mode 100644 index 141add49ca..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj +++ /dev/null @@ -1,82 +0,0 @@ - - - Debug - AnyCPU - 8.0.41115 - 2.0 - {A82F44D7-F336-4AD6-B2EE-D2C082D094EC} - ICSharpCode.NUnitPad - NUnitPad - Library - 4 - False - False - OnSuccessfulBuild - Library - - - True - False - False - True - ..\..\..\..\..\AddIns\AddIns\Misc\NUnitPad\ - False - DEBUG - - - False - True - False - True - ..\..\..\..\..\AddIns\AddIns\Misc\NUnitPad\ - False - - - - - - - - - - - - - - - UserControl - - - Always - - - - - {2748AD25-9C63-4E12-877B-4DCE96FBED54} - ICSharpCode.SharpDevelop - False - - - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - False - - - {98B10E98-003C-45A0-9587-119142E39986} - nunit.extensions.dll - - - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} - nunit.core.dll - - - {83DD7E12-A705-4DBA-9D71-09C8973D9382} - nunit.framework.dll - - - {61CE9CE5-943E-44D4-A381-814DC1406767} - nunit.util.dll - - - - \ No newline at end of file diff --git a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj.user b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj.user deleted file mode 100644 index b895c1ffa7..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj.user +++ /dev/null @@ -1,13 +0,0 @@ - - - ..\..\..\..\..\bin\SharpDevelop.exe - - - ..\..\..\..\..\bin\SharpDevelop.exe - - - 8.0.41115 - ProjectFiles - 0 - - \ No newline at end of file diff --git a/src/AddIns/Misc/NUnitPad/Project/Resources/NUnitPad.addin b/src/AddIns/Misc/NUnitPad/Project/Resources/NUnitPad.addin deleted file mode 100644 index ddc33f4505..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/Resources/NUnitPad.addin +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/AddIns/Misc/NUnitPad/Project/Src/Commands/MenuCommands.cs b/src/AddIns/Misc/NUnitPad/Project/Src/Commands/MenuCommands.cs deleted file mode 100644 index dae143bdb0..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/Src/Commands/MenuCommands.cs +++ /dev/null @@ -1,27 +0,0 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - -using System; - -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop; - -namespace ICSharpCode.NUnitPad -{ - public class RunTestsInProject : AbstractMenuCommand - { - public override void Run() - { - PadDescriptor nunitPad = WorkbenchSingleton.Workbench.GetPad(typeof(NUnitPadContent)); - if (nunitPad != null) { - nunitPad.BringPadToFront(); - ((NUnitPadContent)nunitPad.PadContent).RunTests(); - } - } - } -} diff --git a/src/AddIns/Misc/NUnitPad/Project/Src/Commands/TestTreeViewContextMenuCommands.cs b/src/AddIns/Misc/NUnitPad/Project/Src/Commands/TestTreeViewContextMenuCommands.cs deleted file mode 100644 index 51cc88c413..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/Src/Commands/TestTreeViewContextMenuCommands.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - -using System; -using System.Windows.Forms; - -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop; - -namespace ICSharpCode.NUnitPad -{ - /// - /// Description of RunTestsCommand - /// - public class RunTestsCommand : AbstractMenuCommand - { - /// - /// Creates a new RunTestsCommand - /// - public RunTestsCommand() - { - } - - /// - /// Starts the command - /// - public override void Run() - { - ((TestTreeView)Owner).RunTests(); - } - } - /// - /// Description of GotoDefinitionCommand - /// - public class GotoDefinitionCommand : AbstractMenuCommand - { - /// - /// Creates a new GotoDefinitionCommand - /// - public GotoDefinitionCommand() - { - } - - /// - /// Starts the command - /// - public override void Run() - { - ((TestTreeView)Owner).GotoDefinition(); - } - } -} diff --git a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs b/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs deleted file mode 100644 index b4168de98e..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs +++ /dev/null @@ -1,230 +0,0 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - -using System; -using System.Collections; -using System.Threading; -using System.Windows.Forms; - -using NUnit.Util; -using NUnit.Core; -using NUnit.Framework; -using NUnit.Extensions; - -using ICSharpCode.SharpDevelop.Project; -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Gui; - -namespace ICSharpCode.NUnitPad -{ - /// - /// Description of the pad content - /// - public class NUnitPadContent : AbstractPadContent - { - TestTreeView testTreeView; - Panel contentPanel; - bool autoLoadItems = false; - ArrayList testDomains = new ArrayList(); - - #region AbstractPadContent requirements - /// - /// The representing the pad - /// - public override Control Control { - get { - return contentPanel; - } - } - - /// - /// Creates a new NUnitPadContent object - /// - public NUnitPadContent() - { - testTreeView = new TestTreeView(); - testTreeView.Dock = DockStyle.Fill; - ToolStrip toolStrip = new ToolStrip(); - toolStrip.Dock = DockStyle.Top; - toolStrip.Stretch = true; - toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - - ToolStripButton refreshItem = new ToolStripButton(); - refreshItem.ToolTipText = StringParser.Parse("${res:NUnitPad.NUnitPadContent.RefreshItem}"); - refreshItem.Image = IconService.GetBitmap("Icons.16x16.BrowserRefresh"); - refreshItem.Click += new EventHandler(RefreshItemClick); - toolStrip.Items.Add(refreshItem); - - ToolStripButton cancelItem = new ToolStripButton(); - cancelItem.ToolTipText = StringParser.Parse("${res:NUnitPad.NUnitPadContent.CancelItem}"); - cancelItem.Image = IconService.GetBitmap("Icons.16x16.BrowserCancel"); - cancelItem.Click += new EventHandler(CancelItemClick); - - toolStrip.Items.Add(cancelItem); - - toolStrip.Items.Add(new ToolStripSeparator()); - - ToolStripButton referenceItem = new ToolStripButton(); - referenceItem.ToolTipText = StringParser.Parse("${res:NUnitPad.NUnitPadContent.ReferenceItem}"); - referenceItem.Image = IconService.GetBitmap("Icons.16x16.Reference"); - referenceItem.Click += new EventHandler(AddNUnitReference); - toolStrip.Items.Add(referenceItem); - - toolStrip.Items.Add(new ToolStripSeparator()); - - ToolStripButton runItem = new ToolStripButton(); - runItem.ToolTipText = StringParser.Parse("${res:NUnitPad.NUnitPadContent.RunItem}"); - runItem.Image = IconService.GetBitmap("Icons.16x16.RunProgramIcon"); - runItem.Click += new EventHandler(RunItemClick); - toolStrip.Items.Add(runItem); - - contentPanel = new Panel(); - contentPanel.Controls.Add(testTreeView); - contentPanel.Controls.Add(toolStrip); - - ProjectService.SolutionLoaded += CombineEventHandler; - ProjectService.SolutionClosed += ProjectServiceCombineClosed; - ProjectService.StartBuild += ProjectServiceStartBuild; - ProjectService.EndBuild += ProjectServiceEndBuild; - testTreeView.SetAutoLoadState(autoLoadItems); - } - - /// - /// Refreshes the pad - /// - public override void RedrawContent() - { - } - - /// - /// Cleans up all used resources - /// - public override void Dispose() - { - base.Dispose(); - UnloadAppDomains(); - testTreeView.Dispose(); - contentPanel.Dispose(); - ProjectService.StartBuild -= new EventHandler(ProjectServiceStartBuild); - ProjectService.EndBuild -= new EventHandler(ProjectServiceEndBuild); - } - #endregion - - void ProjectServiceStartBuild(object sender, EventArgs e) - { - } - - void CombineEventHandler(object sender, SolutionEventArgs e) - { - if (autoLoadItems) { - RefreshProjectAssemblies(); - } - } - - void ProjectServiceEndBuild(object sender, EventArgs e) - { - if (autoLoadItems) { - RefreshProjectAssemblies(); - } - } - - void AddNUnitReference(object sender, EventArgs e) - { - if (ProjectService.CurrentProject != null) { - ProjectService.AddProjectItem(ProjectService.CurrentProject, new ReferenceProjectItem(ProjectService.CurrentProject, "nunit.framework")); - ProjectService.CurrentProject.Save(); - } - } - - void RunItemClick(object sender, EventArgs e) - { - RunTests(); - } - - void RefreshItemClick(object sender, EventArgs e) - { - autoLoadItems = true; - RefreshProjectAssemblies(); - } - - void CancelItemClick(object sender, EventArgs e) - { - autoLoadItems = false; - UnloadAppDomains(); - testTreeView.SetAutoLoadState(autoLoadItems); - } - - void ProjectServiceCombineClosed(object sender, EventArgs e) - { - UnloadAppDomains(); - } - - void UnloadAppDomains() - { - /*foreach (TestDomain domain in testDomains) { - try { - domain.Unload(); - } catch (Exception) {} - }*/ - testDomains.Clear(); - testTreeView.ClearTests(); - } - - public void RunTests() - { - if (ProjectService.OpenSolution == null) return; - - if (!autoLoadItems) { - autoLoadItems = true; - RefreshProjectAssemblies(); - } - - testTreeView.RunTests(); - } - - public void RefreshProjectAssemblies() - { - UnloadAppDomains(); - - if (ProjectService.OpenSolution == null) { - return; - } - - foreach (IProject project in ProjectService.OpenSolution.Projects) { - bool referenceFound = false; - foreach (ProjectItem item in project.Items) { - ReferenceProjectItem reference = item as ReferenceProjectItem; - if (reference != null) { - string include = reference.Include; - if (include.IndexOf(',') > 0) { - include = include.Substring(0, include.IndexOf(',')); - } - if (string.Equals(include, "nunit.framework", StringComparison.InvariantCultureIgnoreCase) - || string.Equals(include, "nunit.framework.dll", StringComparison.InvariantCultureIgnoreCase)) - { - referenceFound = true; - break; - } - } - } - if (referenceFound) { - string outputAssembly = project.OutputAssemblyFullPath; - LoggingService.Debug("NUnitPad: Load " + outputAssembly); - try { - TestDomain testDomain = new TestDomain(); - Test test = testDomain.Load(outputAssembly); - - testTreeView.PrintTests(outputAssembly, test, project); - } catch (Exception e) { - LoggingService.Warn("NUnitPad load error", e); - testTreeView.PrintTestErrors(outputAssembly, e); - } - } - } - } - } -} diff --git a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs b/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs deleted file mode 100644 index f5b8713851..0000000000 --- a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs +++ /dev/null @@ -1,383 +0,0 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - -using System; -using System.Collections; -using System.IO; -using System.Windows.Forms; - -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Project; - -using NUnit.Core; -using NUnit.Framework; - -namespace ICSharpCode.NUnitPad -{ - /// - /// Description of TestTreeView. - /// - public class TestTreeView : System.Windows.Forms.UserControl, EventListener, IOwnerState - { - const string ContextMenuAddInTreePath = "/NUnitPad/TestTreeView/ContextMenu"; - - [Flags] - public enum TestTreeViewState { - Nothing = 0, - SourceCodeItemSelected = 1, - TestItemSelected = 2, - } - - sealed class TestItemTag { - public readonly ITest Test; - public readonly IProject Project; - public TestItemTag(ITest test, IProject project) { - this.Test = test; - this.Project = project; - } - public void Run(EventListener listener) { - if (Test is Test) - (Test as Test).Run(listener); - } - public Position GetPosition() { - return ParserService.GetProjectContent(Project).GetPosition(Test.FullName.Replace('+', '.')); - } - } - - protected TestTreeViewState internalState = TestTreeViewState.Nothing; - - public System.Enum InternalState { - get { - return internalState; - } - } - - TreeView treeView; - Hashtable treeNodeHash = new Hashtable(); - MessageViewCategory testRunnerCategory; - - - bool IsSourceCodeItemSelected { - get { - if (treeView.SelectedNode == null) { - return false; - } - TestItemTag test = treeView.SelectedNode.Tag as TestItemTag; - if (test != null) { - - Position position = test.GetPosition(); - return position != null && position.Cu != null; - } - return false; - } - } - - bool IsTestItemSelected { - get { - if (treeView.SelectedNode == null) { - return false; - } - TestItemTag test = treeView.SelectedNode.Tag as TestItemTag; - return test != null; - } - } - - protected override void Dispose(bool disposing) - { - if (disposing) { - treeView.Dispose(); - } - base.Dispose(disposing); - } - - public TestTreeView() - { - - ImageList imageList = new ImageList(); - imageList.ColorDepth = ColorDepth.Depth32Bit; - imageList.Images.Add(IconService.GetBitmap("Icons.16x16.TestRunner.Gray")); - imageList.Images.Add(IconService.GetBitmap("Icons.16x16.TestRunner.Green")); - imageList.Images.Add(IconService.GetBitmap("Icons.16x16.TestRunner.Yellow")); - imageList.Images.Add(IconService.GetBitmap("Icons.16x16.TestRunner.Red")); - imageList.Images.Add(IconService.GetBitmap("Icons.16x16.AboutIcon")); - imageList.Images.Add(IconService.GetBitmap("Icons.16x16.Error")); - - this.treeView = new TreeView(); - treeView.ImageList = imageList; - treeView.Dock = DockStyle.Fill; - treeView.DoubleClick += new EventHandler(ActivateItem); - treeView.KeyPress += new KeyPressEventHandler(TestTreeViewKeyPress); - treeView.MouseDown += new MouseEventHandler(TreeViewMouseDown); - treeView.HideSelection = false; - Controls.Add(treeView); - treeView.ContextMenuStrip = MenuService.CreateContextMenu(this, ContextMenuAddInTreePath); - } - void TreeViewMouseDown(object sender, MouseEventArgs e) - { - TreeNode node = treeView.GetNodeAt(e.X, e.Y); - - treeView.SelectedNode = node; - - internalState = TestTreeViewState.Nothing; - if (IsSourceCodeItemSelected) { - internalState |= TestTreeViewState.SourceCodeItemSelected; - } - - if (IsTestItemSelected) { - internalState |= TestTreeViewState.TestItemSelected; - } - } - - public void SetAutoLoadState(bool state) - { - if (!state) { - ClearTests(); - - TreeNode noAutoLoad = new TreeNode(StringParser.Parse("${res:NUnitPad.NUnitPadContent.TestTreeView.ClickOnRunInformationNode}")); - noAutoLoad.ImageIndex = noAutoLoad.SelectedImageIndex = 4; - treeView.Nodes.Add(noAutoLoad); - } - } - public void ClearTests() - { - if (!treeView.IsDisposed) { - treeView.Nodes.Clear(); - } - } - - public void PrintTestErrors(string assembly, Exception e) - { - TreeNode assemblyNode = new TreeNode(Path.GetFileName(assembly)); - - TreeNode failedNode = new TreeNode(StringParser.Parse("${res:NUnitPad.NUnitPadContent.TestTreeView.LoadingErrorNode}") + ":" + e.Message); - failedNode.ImageIndex = failedNode.SelectedImageIndex = 5; - assemblyNode.Nodes.Add(failedNode); - - treeView.Nodes.Add(assemblyNode); - } - - public void PrintTests(string assembly, Test test, IProject project) - { - TreeNode assemblyNode = new TreeNode(Path.GetFileName(assembly)); - assemblyNode.Tag = new TestItemTag(test, project); - treeView.Nodes.Add(assemblyNode); - if (test != null) { - AddTests(assemblyNode, test, project); - } - assemblyNode.Expand(); - } - - public void AddTests(TreeNode node, ITest test, IProject project) - { - foreach (ITest childTest in test.Tests) { - TreeNode newNode = new TreeNode(childTest.Name); - treeNodeHash[childTest.UniqueName] = newNode; - newNode.ImageIndex = newNode.SelectedImageIndex = 0; - newNode.Tag = new TestItemTag(childTest, project); - if (childTest.IsSuite) { - AddTests(newNode, childTest, project); - node.Expand(); - } - node.Nodes.Add(newNode); - } - } - - public void GotoDefinition() - { - if (treeView.SelectedNode != null) { - TestItemTag testTag = treeView.SelectedNode.Tag as TestItemTag; - if (testTag != null) { - - Position position = testTag.GetPosition(); - - if (position != null && position.Cu != null) { - - FileService.JumpToFilePosition(position.Cu.FileName, Math.Max(0, position.Line - 1), Math.Max(0, position.Column - 1)); - } - } - } - } - - public void RunTests() - { - ResetNodeIcons(treeView.Nodes); - - if (testRunnerCategory == null) { - testRunnerCategory = new MessageViewCategory("NUnit"); - CompilerMessageView cmv = (CompilerMessageView)WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).PadContent; - cmv.AddCategory(testRunnerCategory); - } else { - testRunnerCategory.ClearText(); - } - - TaskService.Clear(); - - TreeNode selectedNode = treeView.SelectedNode; - - if (selectedNode != null) { - TestItemTag test = selectedNode.Tag as TestItemTag; - if (test != null) { - test.Run(this); - } else { - selectedNode.ImageIndex = selectedNode.SelectedImageIndex = 2; - } - } else { - foreach (TreeNode node in treeView.Nodes) { - TestItemTag test = node.Tag as TestItemTag; - if (test != null) { - test.Run(this); - } else { - node.ImageIndex = node.SelectedImageIndex = 2; - } - } - } - - // If any tasks bring task view to front. - if (TaskService.TaskCount > 0) { - IWorkbench Workbench = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.Workbench; - PadDescriptor padDescriptor = Workbench.GetPad(typeof(ErrorList)); - - if (padDescriptor != null) { - padDescriptor.BringPadToFront(); - } - } - - treeView.Focus(); - } - - void ResetNodeIcons(ICollection col) - { - foreach (TreeNode node in col) { - if (node.ImageIndex <= 3) { - node.ImageIndex = node.SelectedImageIndex = 0; - } - ResetNodeIcons(node.Nodes); - } - } - - void SetResultIcon(TestResult testResult) - { - TreeNode node = (TreeNode)treeNodeHash[testResult.Test.UniqueName]; - if (node != null) { - if (testResult.IsSuccess && testResult.Executed) { - node.ImageIndex = node.SelectedImageIndex = 1; - } else if (testResult.IsFailure) { - node.ImageIndex = node.SelectedImageIndex = 3; - } else { - node.ImageIndex = node.SelectedImageIndex = 2; - } - if (node.Parent != null || node.Parent.Parent == null) { - node.Parent.ImageIndex = node.Parent.SelectedImageIndex = node.ImageIndex; - } - } - } - - - void ActivateItem(object sender, EventArgs e) - { - GotoDefinition(); - } - - void TestTreeViewKeyPress(object sender, KeyPressEventArgs e) - { - if (e.KeyChar == '\r') { - GotoDefinition(); - } else if (e.KeyChar == ' ') { - RunTests(); - } - } - - #region NUnit.Core.EventListener interface implementation - public void RunStarted(NUnit.Core.Test[] tests) - { - - } - public void RunFinished(NUnit.Core.TestResult[] tests) - { - - } - public void RunFinished(Exception exception) - { - - } - public void UnhandledException(Exception exception) - { - - } - - public void SuiteStarted(NUnit.Core.TestSuite suite) - { -// testRunnerCategory.AppendText(suite.FullName + " started.\n"); - } - - public void SuiteFinished(NUnit.Core.TestSuiteResult result) - { - SetResultIcon(result); -// testRunnerCategory.AppendText(result.Test.FullName + " finished.\n"); - } - - public void TestStarted(NUnit.Core.TestCase testCase) - { -// testRunnerCategory.AppendText(testCase.FullName + " started.\n"); - } - - public void TestFinished(NUnit.Core.TestCaseResult result) - { - - if (!result.IsSuccess) { - - string outputMessage = StringParser.Parse("${res:NUnitPad.NUnitPadContent.TestTreeView.TestFailedMessage}", new string[,] { - {"TestCase", result.Test.FullName}, - {"Message", result.Message.Replace("\t", " ").Trim()} - } - ); - - testRunnerCategory.AppendText(outputMessage + Environment.NewLine); - testRunnerCategory.AppendText(result.Description + Environment.NewLine); - testRunnerCategory.AppendText(result.StackTrace + Environment.NewLine); - - FileLineReference LineRef = OutputTextLineParser.GetNUnitOutputFileLineReference(result.StackTrace, true); - if (LineRef != null) { - Task Task = new Task(Path.GetFullPath(LineRef.FileName), - outputMessage, - LineRef.Column, - LineRef.Line, - TaskType.Error); - - TaskService.Add(Task); - } - } else if (!result.Executed) { - - string outputMessage = StringParser.Parse("${res:NUnitPad.NUnitPadContent.TestTreeView.TestNotExecutedMessage}", new string[,] { - {"TestCase", result.Test.FullName} - } - ); - - testRunnerCategory.AppendText(outputMessage + Environment.NewLine); - testRunnerCategory.AppendText(result.Message + Environment.NewLine); - testRunnerCategory.AppendText(result.Description + Environment.NewLine); - testRunnerCategory.AppendText(result.StackTrace + Environment.NewLine); - - FileLineReference LineRef = OutputTextLineParser.GetNUnitOutputFileLineReference(result.StackTrace, true); - if (LineRef != null) { - - Task Task = new Task(Path.GetFullPath(LineRef.FileName), - outputMessage, - LineRef.Column, - LineRef.Line, - TaskType.Warning); - - TaskService.Add(Task); - } - } - - SetResultIcon(result); - } - #endregion - } -} diff --git a/src/AddIns/Misc/ProjectImporterExporter/Project/AssemblyInfo.cs b/src/AddIns/Misc/ProjectImporterExporter/Project/AssemblyInfo.cs index 515edb8351..78ad0dd063 100644 --- a/src/AddIns/Misc/ProjectImporterExporter/Project/AssemblyInfo.cs +++ b/src/AddIns/Misc/ProjectImporterExporter/Project/AssemblyInfo.cs @@ -27,7 +27,7 @@ using System.Security.Permissions; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs index 6f663d2970..17c35f10bc 100644 --- a/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs index 9edb2dcfc0..bf04aeb579 100644 --- a/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/SubversionAddIn/Project/Configuration/AssemblyInfo.cs index 58386f60c4..49e372ecdb 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/AddIns/Wizards/MessageBoxBuilder/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Wizards/MessageBoxBuilder/Project/Configuration/AssemblyInfo.cs index fb66127254..8877ea3810 100644 --- a/src/AddIns/Wizards/MessageBoxBuilder/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Wizards/MessageBoxBuilder/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs index 9972c90e4b..493ba804d8 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs index 6801305f3c..3f11c10492 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs +++ b/src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs @@ -17,7 +17,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("ICSharpCode.TextEditor.key")] diff --git a/src/Libraries/ICSharpCode.TextEditor/Test/AssemblyInfo.cs b/src/Libraries/ICSharpCode.TextEditor/Test/AssemblyInfo.cs index 33d85c4a67..4f853088d7 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Test/AssemblyInfo.cs +++ b/src/Libraries/ICSharpCode.TextEditor/Test/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs b/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs index 3b6c8ec8b1..014943d770 100644 --- a/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs +++ b/src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/Libraries/NRefactory/Test/AssemblyInfo.cs b/src/Libraries/NRefactory/Test/AssemblyInfo.cs index 33d85c4a67..4f853088d7 100644 --- a/src/Libraries/NRefactory/Test/AssemblyInfo.cs +++ b/src/Libraries/NRefactory/Test/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/Main/Base/Project/Configuration/AssemblyInfo.cs b/src/Main/Base/Project/Configuration/AssemblyInfo.cs index 13dfa27575..8b5860c738 100644 --- a/src/Main/Base/Project/Configuration/AssemblyInfo.cs +++ b/src/Main/Base/Project/Configuration/AssemblyInfo.cs @@ -19,6 +19,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyDelaySign(false)] diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs index 37710c3fff..3a0f49f801 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs @@ -922,7 +922,6 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver members.AddRange(t.GetFields()); members.AddRange(t.GetEvents()); members.AddRange(t.GetProperties()); - members.AddRange(t.GetIndexers()); foreach (IMember m in members) { if ((m.IsStatic || !inStatic) && m.IsAccessible(callingClass, true)) { result.Add(m); diff --git a/src/Main/Base/Project/Src/Project/PropertyGroup.cs b/src/Main/Base/Project/Src/Project/PropertyGroup.cs index c0e761df16..c3e0ba4a4a 100644 --- a/src/Main/Base/Project/Src/Project/PropertyGroup.cs +++ b/src/Main/Base/Project/Src/Project/PropertyGroup.cs @@ -36,7 +36,12 @@ namespace ICSharpCode.SharpDevelop.Project return defaultValue; } TypeConverter c = TypeDescriptor.GetConverter(typeof(T)); + try { return (T)c.ConvertFromInvariantString(properties[property]); + } catch (FormatException ex) { + ICSharpCode.Core.LoggingService.Warn("Cannot get property " + property, ex); + return defaultValue; + } } public void Set(string property, T defaultValue, T value) diff --git a/src/Main/Base/Test/AssemblyInfo.cs b/src/Main/Base/Test/AssemblyInfo.cs index 33d85c4a67..4f853088d7 100644 --- a/src/Main/Base/Test/AssemblyInfo.cs +++ b/src/Main/Base/Test/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/Main/Core/Project/Configuration/AssemblyInfo.cs b/src/Main/Core/Project/Configuration/AssemblyInfo.cs index e5d84e5083..2bce0bd2d3 100644 --- a/src/Main/Core/Project/Configuration/AssemblyInfo.cs +++ b/src/Main/Core/Project/Configuration/AssemblyInfo.cs @@ -20,6 +20,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyDelaySign(false)] diff --git a/src/Main/Core/Test/AssemblyInfo.cs b/src/Main/Core/Test/AssemblyInfo.cs index 167406197b..23a324effc 100644 --- a/src/Main/Core/Test/AssemblyInfo.cs +++ b/src/Main/Core/Test/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("2.0.0.348")] +[assembly: AssemblyVersion("2.0.0.1")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. diff --git a/src/Main/StartUp/Project/SharpDevelop.exe.config b/src/Main/StartUp/Project/SharpDevelop.exe.config index 987471e89d..67038f51ae 100644 --- a/src/Main/StartUp/Project/SharpDevelop.exe.config +++ b/src/Main/StartUp/Project/SharpDevelop.exe.config @@ -6,19 +6,19 @@ - + - + - + - + diff --git a/src/Main/StartUp/Project/SharpDevelopMain.cs b/src/Main/StartUp/Project/SharpDevelopMain.cs index 58856a1f97..e006559851 100644 --- a/src/Main/StartUp/Project/SharpDevelopMain.cs +++ b/src/Main/StartUp/Project/SharpDevelopMain.cs @@ -148,8 +148,10 @@ namespace ICSharpCode.SharpDevelop try { #if DEBUG if (!Debugger.IsAttached) { + #endif Application.ThreadException += ShowErrorBox; AppDomain.CurrentDomain.UnhandledException += ShowErrorBox; + #if DEBUG } #else MessageService.CustomErrorReporter = ShowErrorBox; diff --git a/src/SharpDevelop.WithTests.sln b/src/SharpDevelop.WithTests.sln index 00f1a377fc..55805ec41b 100644 --- a/src/SharpDevelop.WithTests.sln +++ b/src/SharpDevelop.WithTests.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# SharpDevelop 2.0.0.343 +# SharpDevelop 2.0.0.348 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -46,8 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Mis EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitPad", "AddIns\Misc\NUnitPad\Project\NUnitPad.csproj", "{A82F44D7-F336-4AD6-B2EE-D2C082D094EC}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}" @@ -66,20 +64,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Librarie EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll", "Tools\NUnit\src\ClientUtilities\util\nunit.util.dll.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -192,7 +184,6 @@ Global {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {A82F44D7-F336-4AD6-B2EE-D2C082D094EC} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} @@ -200,13 +191,10 @@ Global {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {61CE9CE5-943E-44D4-A381-814DC1406767} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index c37b4dcacb..7509014a0b 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.343 +# SharpDevelop 2.0.0.348 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -44,8 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Mis EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitPad", "AddIns\Misc\NUnitPad\Project\NUnitPad.csproj", "{A82F44D7-F336-4AD6-B2EE-D2C082D094EC}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}" @@ -62,20 +60,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll", "Tools\NUnit\src\ClientUtilities\util\nunit.util.dll.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -183,7 +175,6 @@ Global {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {A82F44D7-F336-4AD6-B2EE-D2C082D094EC} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} @@ -191,13 +182,10 @@ Global {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {61CE9CE5-943E-44D4-A381-814DC1406767} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}